Skip to content

Fix Debian:sid container env build #926

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.

Sign up for GitHub

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

Closed
RazvanLiviuVarzaru wants to merge 1 commit into from
Closed

Fix Debian:sid container env build #926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ci_build_images/debian.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RUN . /etc/os-release \
exit 1; \
fi

ARG BASE_IMAGE
ARG ARCH_VARIANT=
ENV ARCH_VARIANT=$ARCH_VARIANT
# Install updates and required packages
Expand Down Expand Up @@ -71,7 +72,11 @@ RUN . /etc/os-release \
libasio-dev \
# bootstrapping libboost additions in below line for MDEV-35826. \
# to be removed after https://github.com/MariaDB/server/pull/2651 merge to 11.4 \
libboost-atomic-dev libboost-chrono-dev libboost-date-time-dev libboost-regex-dev libboost-system-dev libboost-thread-dev \
libboost-atomic-dev \
libboost-chrono-dev \
libboost-date-time-dev \
libboost-regex-dev \
libboost-thread-dev \
libboost-dev \
libboost-filesystem-dev \
libboost-program-options-dev \
Expand All @@ -90,6 +95,7 @@ RUN . /etc/os-release \
socat \
sudo \
wget \
&& if [ "$BASE_IMAGE" != "debian:sid" ]; then apt-get -y install --no-install-recommends libboost-system-dev; fi \
&& if [ "$(getconf LONG_BIT)" = 64 ]; then apt-get -y install --no-install-recommends galera-4; fi \
&& if [ "${VERSION_ID}" != 11 ]; then \
# Bootstrap MDEV-32686 so only temporary until https://github.com/MariaDB/server/pull/3692 merged up \
Expand Down
Loading