Skip to content

Commit

Permalink
Fix images based on Alpine 3.{17,18}
Browse files Browse the repository at this point in the history
- Downgrade package pkgconf to v1.8.1
  • Loading branch information
benz0li committed Sep 7, 2023
1 parent beb0429 commit c492963
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 0 deletions.
5 changes: 5 additions & 0 deletions VERSION_MATRIX.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@ Topmost entry = Tag `latest`

[^1]: unsupported build; *statically linked* binary
[^2]: w/o Haddock; due to `HADDOCK_DOCS=NO`

## Bug fixes

* Images based on Alpine 3.{17,18}: Package pkgconf downgraded to v1.8.1
* Due to https://github.com/haskell/cabal/issues/8923
7 changes: 7 additions & 0 deletions latest.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal

RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
&& ./configure --disable-ld-override \
Expand Down
7 changes: 7 additions & 0 deletions prior/9.4.4.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ COPY --from=bootstrap /tmp/ghc-$GHC_VERSION/_build/bindist/ghc-$GHC_VERSION-*-al
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal

RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
&& tar -xJf ghc-$GHC_VERSION-*-alpine-linux.tar.xz \
&& cd ghc-$GHC_VERSION-*-alpine-linux \
&& ./configure --disable-ld-override \
Expand Down
7 changes: 7 additions & 0 deletions prior/9.4.5.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ COPY --from=bootstrap /tmp/ghc-$GHC_VERSION/_build/bindist/ghc-$GHC_VERSION-*-al
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal

RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
&& tar -xJf ghc-$GHC_VERSION-*-alpine-linux.tar.xz \
&& cd ghc-$GHC_VERSION-*-alpine-linux \
&& ./configure --disable-ld-override \
Expand Down
7 changes: 7 additions & 0 deletions prior/9.4.6.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal

RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
&& ./configure --disable-ld-override \
Expand Down
7 changes: 7 additions & 0 deletions prior/9.4.7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal

RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
&& ./configure --disable-ld-override \
Expand Down
7 changes: 7 additions & 0 deletions prior/9.6.1.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ COPY --from=bootstrap /tmp/ghc-"$GHC_VERSION"/_build/bindist/ghc-"$GHC_VERSION"-
COPY --from=bootstrap /root/.cabal/bin/cabal /usr/local/bin/cabal

RUN cd /tmp \
# Fix https://github.com/haskell/cabal/issues/8923
&& PKG_CONFIG_VERSION="$(pkg-config --version)" \
&& if [ "${PKG_CONFIG_VERSION%.*}" = "1.9" ]; then \
# Downgrade pkgconf from 1.9.x to 1.8.1
curl -sSLO http://dl-cdn.alpinelinux.org/alpine/v3.16/main/"$(uname -m)"/pkgconf-1.8.1-r0.apk; \
apk add --no-cache pkgconf-1.8.1-r0.apk; \
fi \
&& tar -xJf ghc-"$GHC_VERSION"-*-alpine-linux.tar.xz \
&& cd ghc-"$GHC_VERSION"-*-alpine-linux \
&& ./configure --disable-ld-override \
Expand Down

0 comments on commit c492963

Please sign in to comment.