diff options
| author | Lukas Larsson <lukas@erlang.org> | 2021-08-17 18:29:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2021-08-17 18:29:27 +0200 |
| commit | 349aee7a780b91fb9d7b43eb8bb5b76e53d98f0e (patch) | |
| tree | 360f3b0f0be154dd0b1f977ee54938354e269ef5 | |
| parent | 2ea38ee5807879b1f913fd959af7869bd04fc24b (diff) | |
| download | erlang-349aee7a780b91fb9d7b43eb8bb5b76e53d98f0e.tar.gz | |
gh-actions: Pin debian version to bullseye
| -rw-r--r-- | .github/dockerfiles/Dockerfile.debian-base | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base index 094a79f20a..66a2f4dc22 100644 --- a/.github/dockerfiles/Dockerfile.debian-base +++ b/.github/dockerfiles/Dockerfile.debian-base @@ -2,7 +2,7 @@ ## This docker file will build a base image for building Erlang/OTP ## ARG BASE=debian -FROM $BASE +FROM $BASE:bullseye ## Need to have a second arg here as the first does not expose the $BASE in the script below ARG BASE=debian @@ -11,7 +11,7 @@ ENV HOST_TRIP=$HOST_TRIP ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 -ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libgmp3-dev libwxbase3.0-dev libwxgtk3.0-dev libwxgtk-webview3.0-gtk3-dev libsctp-dev lksctp-tools" +ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libgmp3-dev libwxgtk3.0-gtk3-dev libwxgtk-webview3.0-gtk3-dev libsctp-dev lksctp-tools" ## See https://wiki.debian.org/Multiarch/HOWTO for details on how to install things ## @@ -30,7 +30,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential & apt-get install -y build-essential m4 autoconf fop xsltproc default-jdk libxml2-utils \ $INSTALL_LIBS && \ if [ "$HOST_TRIP" != "$BUILD_TRIP" ]; then \ - apt-get install -y -f -o Dpkg::Options::="--force-overwrite" \ + apt-get install -y -f \ crossbuild-essential-$HOST_ARCH \ $(for LIB in $INSTALL_LIBS; do echo "$LIB:$HOST_ARCH"; done) && \ for dir in `find / -type d -name $HOST_TRIP`; do \ |