From 6782141d8afa796bdfcd0c281cbb41a944d7a708 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 10 Aug 2021 09:57:26 +0200 Subject: Backport github dockerfile changes bf48282 and e4c3fcf --- .github/dockerfiles/Dockerfile.debian-base | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base index 416edd97c9..b6a8291e6f 100644 --- a/.github/dockerfiles/Dockerfile.debian-base +++ b/.github/dockerfiles/Dockerfile.debian-base @@ -8,8 +8,10 @@ ARG BASE=debian ARG HOST_TRIP=x86_64-linux-gnu ENV HOST_TRIP=$HOST_TRIP +ENV LANG=C.UTF-8 +ENV LC_ALL=C.UTF-8 -ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssh-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 libwxbase3.0-dev libwxgtk3.0-dev libwxgtk-webview3.0-gtk3-dev libsctp-dev lksctp-tools" ## See https://wiki.debian.org/Multiarch/HOWTO for details on how to install things ## -- cgit v1.2.1 From 2ea38ee5807879b1f913fd959af7869bd04fc24b Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 10 Aug 2021 09:59:10 +0200 Subject: gh-actions: Fix libaspell crossenv install New version of debian has different content for the releasenotes of libaspell15 in i386 and amd64 for some reason. So we add an option to force an overwrite if that is the case. Unpacking libaspell15:amd64 (0.60.7~20110707-6+deb10u1) ... dpkg: error processing archive /tmp/apt-dpkg-install-HU2OJ5/074-libaspell15_0.60.7~20110707-6+deb10u1_amd64.deb (--unpack): trying to overwrite shared '/usr/share/doc/libaspell15/changelog.gz', which is different from other instances of package libaspell15:amd64 --- .github/dockerfiles/Dockerfile.debian-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base index b6a8291e6f..094a79f20a 100644 --- a/.github/dockerfiles/Dockerfile.debian-base +++ b/.github/dockerfiles/Dockerfile.debian-base @@ -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 \ + apt-get install -y -f -o Dpkg::Options::="--force-overwrite" \ 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 \ -- cgit v1.2.1 From 349aee7a780b91fb9d7b43eb8bb5b76e53d98f0e Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 17 Aug 2021 18:29:27 +0200 Subject: gh-actions: Pin debian version to bullseye --- .github/dockerfiles/Dockerfile.debian-base | 6 +++--- 1 file 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 \ -- cgit v1.2.1