diff --git a/cabal.project.release b/cabal.project.release index d9eb7ccf..889fa62c 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -9,6 +9,7 @@ package ghcup flags: +tui if os(linux) + constraints: xz -system-xz if arch(x86_64) || arch(i386) flags: -tar package * @@ -27,6 +28,7 @@ elif os(mingw32) elif os(freebsd) flags: -tar constraints: zlib +bundled-c-zlib, - zip +disable-zstd + zip +disable-zstd, + xz -system-xz package * ghc-options: -split-sections diff --git a/docker/alpine32/Dockerfile b/docker/alpine32/Dockerfile index e6bbad13..4e424457 100644 --- a/docker/alpine32/Dockerfile +++ b/docker/alpine32/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/i386 i386/alpine:3.20 +FROM --platform=linux/i386 i386/alpine:3.16 ENV LANG C.UTF-8 @@ -35,7 +35,6 @@ RUN apk add --no-cache \ openssl-libs-static \ xz \ xz-dev \ - xz-static \ ncurses-static ARG GHCUP_VERSION=0.1.20.0 diff --git a/docker/alpine64/Dockerfile b/docker/alpine64/Dockerfile index 10c27ea2..16d22099 100644 --- a/docker/alpine64/Dockerfile +++ b/docker/alpine64/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 +FROM alpine:3.12 ENV LANG C.UTF-8 @@ -35,7 +35,6 @@ RUN apk add --no-cache \ openssl-libs-static \ xz \ xz-dev \ - xz-static \ ncurses-static ARG GHCUP_VERSION=0.1.20.0