diff options
| author | Erlang/OTP <otp@erlang.org> | 2021-09-02 12:45:09 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2021-09-02 12:45:09 +0200 |
| commit | 87a39736317af5b8e026cf43e535b16055ac0f50 (patch) | |
| tree | c7bd1ca49a4f5bc36862fb91b3829ef085b24688 | |
| parent | 9e79f720d4dbb949cf86ae624ab239fce69bbbcc (diff) | |
| parent | 349aee7a780b91fb9d7b43eb8bb5b76e53d98f0e (diff) | |
| download | erlang-87a39736317af5b8e026cf43e535b16055ac0f50.tar.gz | |
Merge branch 'lukas/add-github-actions' into maint-23
* lukas/add-github-actions:
gh-actions: Pin debian version to bullseye
gh-actions: Fix libaspell crossenv install
Backport github dockerfile changes bf48282 and e4c3fcf
| -rw-r--r-- | .github/dockerfiles/Dockerfile.debian-base | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base index 416edd97c9..66a2f4dc22 100644 --- a/.github/dockerfiles/Dockerfile.debian-base +++ b/.github/dockerfiles/Dockerfile.debian-base @@ -2,14 +2,16 @@ ## 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 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 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 ## @@ -28,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 \ 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 \ |