Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add docker image for Meson build on Debian Bookworm #1552

Merged
merged 1 commit into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/docker/buildAll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set -xe
./archlinux_gcc_meson/build.sh
./debian_buster_gcc_meson/build.sh
./debian_bullseye_gcc_meson/build.sh
./debian_bookworm_gcc_meson/build.sh
./ubuntu_22.04_gcc_cmake/build.sh
./ubuntu_22.04_gcc_meson_qt6/build.sh
./ubuntu_22.04_aarch64_gcc_cmake/build.sh
32 changes: 32 additions & 0 deletions ci/docker/debian_bookworm_gcc_meson/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM debian:bookworm

RUN apt-get update && apt-get install -y \
git make libtool pkg-config \
libxml2-dev libprotobuf-dev protobuf-compiler \
libagg-dev \
libfreetype6-dev \
libcairo2-dev \
libpangocairo-1.0-0 libpango1.0-dev \
qtdeclarative5-dev libqt5svg5-dev \
qtlocation5-dev qtpositioning5-dev qttools5-dev-tools qttools5-dev qtmultimedia5-dev \
freeglut3-dev libglew-dev libglm-dev \
libtbb-dev liblzma-dev \
libmarisa-dev \
doxygen \
locales \
meson ninja-build g++ \
&& rm -rf /var/lib/apt/lists/*

RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
RUN locale-gen
ENV LANG en_US.utf8

ENV QT_QPA_PLATFORM offscreen

RUN mkdir /work

COPY data/build.sh /work
RUN chmod +x /work/build.sh

WORKDIR /work
CMD ./build.sh
3 changes: 3 additions & 0 deletions ci/docker/debian_bookworm_gcc_meson/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
cd `dirname $0`
docker build -t libosmscout/debian_bullseye_gcc_meson .
25 changes: 25 additions & 0 deletions ci/docker/debian_bookworm_gcc_meson/data/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/sh
set -e

if [ $# -ge 1 ] ; then
REPO="$1"
else
REPO="https://github.com/Framstag/libosmscout.git"
fi

if [ $# -ge 2 ] ; then
BRANCH="$2"
else
BRANCH="master"
fi

git clone -b "$BRANCH" "$REPO" libosmscout

env

cd libosmscout
meson debug
cd debug

ninja
ninja test
3 changes: 3 additions & 0 deletions ci/docker/debian_bookworm_gcc_meson/run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

docker run --rm=true -it libosmscout/debian_bullseye_gcc_meson ./build.sh "$@"
6 changes: 6 additions & 0 deletions ci/docker/runAll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ RESULT_debian_buster_gcc_meson=$?
./debian_bullseye_gcc_meson/run.sh "$@"
RESULT_debian_bullseye_gcc_meson=$?

./debian_bullseye_gcc_meson/run.sh "$@"
RESULT_debian_bookworm_gcc_meson=$?

./ubuntu_22.04_gcc_cmake/run.sh "$@"
RESULT_ubuntu_22_04_gcc_cmake=$?

Expand Down Expand Up @@ -45,6 +48,9 @@ if [ $RESULT_debian_buster_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FA
echo -ne "debian_bullseye_gcc_meson "
if [ $RESULT_debian_bullseye_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi

echo -ne "debian_bullseye_gcc_meson "
if [ $RESULT_debian_bookworm_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi

echo -ne "ubuntu_22.04_gcc_cmake "
if [ $RESULT_ubuntu_22_04_gcc_cmake -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi

Expand Down