Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Haskell bumps + remove stretch support #11098

Merged
merged 1 commit into from
Oct 13, 2021

Conversation

AlistairB
Copy link
Contributor

Thanks

- Update cabal-install to 3.6.2.0
- Drop support for debian 9 stretch which latest cabal-install does not
  support.
@github-actions
Copy link

Diff for 78e507d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6f62949..f3d26b1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,17 +2,9 @@ Maintainers: Peter Salvatore <peter@psftw.com> (@psftw), Herbert Valerio Riedel
 GitRepo: https://github.com/haskell/docker-haskell
 
 Tags: 8.10.7-buster, 8.10-buster, 8-buster, 8.10.7, 8.10, 8
-GitCommit: 4181ccd382f72959ecb234204fd018b2c203c3fe
+GitCommit: f08ade43f48981b87505fbecca852194954fa61b
 Directory: 8.10/buster
 
-Tags: 8.10.7-stretch, 8.10-stretch, 8-stretch
-GitCommit: 4181ccd382f72959ecb234204fd018b2c203c3fe
-Directory: 8.10/stretch
-
 Tags: 9.0.1-buster, 9.0-buster, 9-buster, buster, 9.0.1, 9.0, 9, latest
-GitCommit: 4181ccd382f72959ecb234204fd018b2c203c3fe
+GitCommit: f08ade43f48981b87505fbecca852194954fa61b
 Directory: 9.0/buster
-
-Tags: 9.0.1-stretch, 9.0-stretch, 9-stretch, stretch
-GitCommit: 4181ccd382f72959ecb234204fd018b2c203c3fe
-Directory: 9.0/stretch
diff --git a/_bashbrew-list b/_bashbrew-list
index 1cf2b63..539a9d4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,21 +1,14 @@
 haskell:8
 haskell:8-buster
-haskell:8-stretch
 haskell:8.10
 haskell:8.10-buster
-haskell:8.10-stretch
 haskell:8.10.7
 haskell:8.10.7-buster
-haskell:8.10.7-stretch
 haskell:9
 haskell:9-buster
-haskell:9-stretch
 haskell:9.0
 haskell:9.0-buster
-haskell:9.0-stretch
 haskell:9.0.1
 haskell:9.0.1-buster
-haskell:9.0.1-stretch
 haskell:buster
 haskell:latest
-haskell:stretch
diff --git a/haskell_8-stretch/Dockerfile b/haskell_8-stretch/Dockerfile
deleted file mode 100644
index 5f83609..0000000
diff --git a/haskell_8/Dockerfile b/haskell_8/Dockerfile
index fe359ce..3f5ca0f 100644
--- a/haskell_8/Dockerfile
+++ b/haskell_8/Dockerfile
@@ -23,10 +23,10 @@ RUN apt-get update && \
         zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 
-ARG CABAL_INSTALL=3.6.0.0
+ARG CABAL_INSTALL=3.6.2.0
 ARG CABAL_INSTALL_RELEASE_KEY=A970DF3AC3B9709706D74544B3D9F94B8DCAE210
 # get from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
-ARG CABAL_INSTALL_RELEASE_SHA256=BFCB7350966DAFE95051B5FC9FCB989C5708AB9E78191E71FC04647061668A11
+ARG CABAL_INSTALL_RELEASE_SHA256=4759B56E9257E02F29FA374A6B25D6CB2F9D80C7E3A55D4F678A8E570925641C
 
 RUN cd /tmp && \
     export GNUPGHOME="$(mktemp -d)" && \
@@ -34,7 +34,7 @@ RUN cd /tmp && \
     curl -fSLO https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS && \
     curl -fSLO https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS.sig && \
     gpg --batch --trusted-key B3D9F94B8DCAE210 --verify SHA256SUMS.sig SHA256SUMS && \
-    curl -fSL https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-x86_64-linux.tar.xz -o cabal-install.tar.gz && \
+    curl -fSL https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-x86_64-linux-deb10.tar.xz -o cabal-install.tar.gz && \
     echo "$CABAL_INSTALL_RELEASE_SHA256 cabal-install.tar.gz" | sha256sum --strict --check && \
     tar -xf cabal-install.tar.gz -C /usr/local/bin && \
     rm -rf "$GNUPGHOME" /var/lib/apt/lists/* /tmp/*
diff --git a/haskell_latest/Dockerfile b/haskell_latest/Dockerfile
index ab535be..bcc0929 100644
--- a/haskell_latest/Dockerfile
+++ b/haskell_latest/Dockerfile
@@ -23,10 +23,10 @@ RUN apt-get update && \
         zlib1g-dev && \
     rm -rf /var/lib/apt/lists/*
 
-ARG CABAL_INSTALL=3.6.0.0
+ARG CABAL_INSTALL=3.6.2.0
 ARG CABAL_INSTALL_RELEASE_KEY=A970DF3AC3B9709706D74544B3D9F94B8DCAE210
 # get from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
-ARG CABAL_INSTALL_RELEASE_SHA256=BFCB7350966DAFE95051B5FC9FCB989C5708AB9E78191E71FC04647061668A11
+ARG CABAL_INSTALL_RELEASE_SHA256=4759B56E9257E02F29FA374A6B25D6CB2F9D80C7E3A55D4F678A8E570925641C
 
 RUN cd /tmp && \
     export GNUPGHOME="$(mktemp -d)" && \
@@ -34,7 +34,7 @@ RUN cd /tmp && \
     curl -fSLO https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS && \
     curl -fSLO https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS.sig && \
     gpg --batch --trusted-key B3D9F94B8DCAE210 --verify SHA256SUMS.sig SHA256SUMS && \
-    curl -fSL https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-x86_64-linux.tar.xz -o cabal-install.tar.gz && \
+    curl -fSL https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-x86_64-linux-deb10.tar.xz -o cabal-install.tar.gz && \
     echo "$CABAL_INSTALL_RELEASE_SHA256 cabal-install.tar.gz" | sha256sum --strict --check && \
     tar -xf cabal-install.tar.gz -C /usr/local/bin && \
     rm -rf "$GNUPGHOME" /var/lib/apt/lists/* /tmp/*
diff --git a/haskell_stretch/Dockerfile b/haskell_stretch/Dockerfile
deleted file mode 100644
index 2e13b09..0000000

Relevant Maintainers:

@tianon tianon merged commit f7d0d1f into docker-library:master Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants