Skip to content
Snippets Groups Projects
Commit cee9f773 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

feat: move to Dockerfile heredoc

parent 196c15b0
No related branches found
No related tags found
1 merge request!758feat: move to Dockerfile heredoc
This commit is part of merge request !758. Comments created here will be created in the context of that merge request.
Expand all Show whitespace changes
Inline Side-by-side
containers/debian/base.Dockerfile
+ 39
− 49
View file @ cee9f773
...@@ -18,12 +18,12 @@ ENV CLICOLOR_FORCE=1 \ ...@@ -18,12 +18,12 @@ ENV CLICOLOR_FORCE=1 \
## Install additional packages. Remove the auto-cleanup functionality ## Install additional packages. Remove the auto-cleanup functionality
## for docker, as we're using the new buildkit cache instead. ## for docker, as we're using the new buildkit cache instead.
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF
rm -f /etc/apt/apt.conf.d/docker-clean \ rm -f /etc/apt/apt.conf.d/docker-clean
&& ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \ ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
&& echo "US/Eastern" > /etc/timezone \ echo "US/Eastern" > /etc/timezone
&& apt-get -yqq update \ apt-get -yqq update
&& apt-get -yqq install --no-install-recommends \ apt-get -yqq install --no-install-recommends \
bc \ bc \
bzip2 \ bzip2 \
ca-certificates \ ca-certificates \
...@@ -54,49 +54,39 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ...@@ -54,49 +54,39 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
unzip \ unzip \
vim-nox \ vim-nox \
wget \ wget \
&& apt-get -yqq autoremove \ apt-get -yqq autoremove
&& localedef -i en_US -f UTF-8 en_US.UTF-8 localedef -i en_US -f UTF-8 en_US.UTF-8
EOF
# Install updated compilers, with support for multiple base images # Install updated compilers, with support for multiple base images
## Ubuntu: latest gcc from toolchain ppa, latest stable clang ## Ubuntu: latest gcc from toolchain ppa, latest stable clang
## Debian: default gcc with distribution, latest stable clang ## Debian: default gcc with distribution, latest stable clang
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF
. /etc/os-release \ . /etc/os-release
&& mkdir -p /etc/apt/source.list.d \ mkdir -p /etc/apt/source.list.d
&& if [ "${ID}" = "ubuntu" ] ; then \ if [ "${ID}" = "ubuntu" ] ; then
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/ \ echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
${VERSION_CODENAME} main" \ if [ "${VERSION_ID}" = "20.04" ] ; then GCC="-10" CLANG="-12" ; fi
> /etc/apt/source.list.d/ubuntu-toolchain.list \ if [ "${VERSION_ID}" = "22.04" ] ; then GCC="-12" CLANG="-14" ; fi
&& if [ "${VERSION_ID}" = "20.04" ] ; then GCC="-10" CLANG="-12" ; fi\ curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
&& if [ "${VERSION_ID}" = "22.04" ] ; then GCC="-12" CLANG="-14" ; fi\ echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME}${CLANG} main" > /etc/apt/source.list.d/llvm.list
&& curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -\ apt-get -yqq update
&& echo "deb http://apt.llvm.org/${VERSION_CODENAME} \ apt-get -yqq install gcc${GCC} g++${GCC} gfortran${GCC}
llvm-toolchain-${VERSION_CODENAME}${CLANG} main" \ apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG}
> /etc/apt/source.list.d/llvm.list \ apt-get -yqq install iwyu
&& apt-get -yqq update \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc${GCC} 100
&& apt-get -yqq install \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++${GCC} 100
gcc${GCC} g++${GCC} gfortran${GCC} \ update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran${GCC} 100
&& apt-get -yqq install \ update-alternatives --install /usr/bin/clang clang /usr/bin/clang${CLANG} 100
clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} \ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++${CLANG} 100
iwyu \ else
&& update-alternatives --install /usr/bin/gcc gcc \ apt-get -yqq update
/usr/bin/gcc${GCC} 100 \ apt-get -yqq install gcc g++ gfortran
&& update-alternatives --install /usr/bin/g++ g++ \ apt-get -yqq install clang clang-tidy clang-format
/usr/bin/g++${GCC} 100 \ apt-get -yqq install iwyu
&& update-alternatives --install /usr/bin/gfortran gfortran \ fi
/usr/bin/gfortran${GCC} 100 \ apt-get -yqq autoremove
&& update-alternatives --install /usr/bin/clang clang \ gcc --version
/usr/bin/clang${CLANG} 100 \ clang --version
&& update-alternatives --install /usr/bin/clang++ clang++ \ EOF
/usr/bin/clang++${CLANG} 100 \
; else \
apt-get -yqq update \
&& apt-get -yqq install \
gcc g++ gfortran \
clang clang-tidy clang-format \
iwyu \
; fi \
&& apt-get -yqq autoremove \
&& gcc --version \
&& clang --version
containers/jug/dev.Dockerfile
+ 136
− 147
View file @ cee9f773
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment