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

Update to GHC 8.10.2, 8.8.4, and Stack 2.3.3. #8570

Merged
merged 1 commit into from
Aug 17, 2020

Conversation

psftw
Copy link
Contributor

@psftw psftw commented Aug 17, 2020

No description provided.

@github-actions
Copy link

Diff for 01a261a:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 540c005..0314c9d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,18 +1,18 @@
 Maintainers: Peter Salvatore <peter@psftw.com> (@psftw), Herbert Valerio Riedel <hvr@gnu.org> (@hvr)
 GitRepo: https://github.com/haskell/docker-haskell
 
-Tags: 8.8.3-buster, 8.8-buster, 8.8.3, 8.8
-GitCommit: 82f44382a183fcc1d0026d8abe58259195a8930c
+Tags: 8.8.4-buster, 8.8-buster, 8.8.4, 8.8
+GitCommit: ab3b5fd3a88efd8570f3ed1512a124c3424efa3b
 Directory: 8.8/buster
 
-Tags: 8.8.3-stretch, 8.8-stretch
-GitCommit: 82f44382a183fcc1d0026d8abe58259195a8930c
+Tags: 8.8.4-stretch, 8.8-stretch
+GitCommit: ab3b5fd3a88efd8570f3ed1512a124c3424efa3b
 Directory: 8.8/stretch
 
-Tags: 8.10.1-buster, 8.10-buster, 8-buster, buster, 8.10.1, 8.10, 8, latest
-GitCommit: 82f44382a183fcc1d0026d8abe58259195a8930c
+Tags: 8.10.2-buster, 8.10-buster, 8-buster, buster, 8.10.2, 8.10, 8, latest
+GitCommit: ab3b5fd3a88efd8570f3ed1512a124c3424efa3b
 Directory: 8.10/buster
 
-Tags: 8.10.1-stretch, 8.10-stretch, 8-stretch, stretch
-GitCommit: 82f44382a183fcc1d0026d8abe58259195a8930c
+Tags: 8.10.2-stretch, 8.10-stretch, 8-stretch, stretch
+GitCommit: ab3b5fd3a88efd8570f3ed1512a124c3424efa3b
 Directory: 8.10/stretch
diff --git a/_bashbrew-list b/_bashbrew-list
index 5277f51..e519699 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,15 +4,15 @@ haskell:8-stretch
 haskell:8.8
 haskell:8.8-buster
 haskell:8.8-stretch
-haskell:8.8.3
-haskell:8.8.3-buster
-haskell:8.8.3-stretch
+haskell:8.8.4
+haskell:8.8.4-buster
+haskell:8.8.4-stretch
 haskell:8.10
 haskell:8.10-buster
 haskell:8.10-stretch
-haskell:8.10.1
-haskell:8.10.1-buster
-haskell:8.10.1-stretch
+haskell:8.10.2
+haskell:8.10.2-buster
+haskell:8.10.2-stretch
 haskell:buster
 haskell:latest
 haskell:stretch
diff --git a/haskell_8.8-stretch/Dockerfile b/haskell_8.8-stretch/Dockerfile
index 0cb295c..8944a53 100644
--- a/haskell_8.8-stretch/Dockerfile
+++ b/haskell_8.8-stretch/Dockerfile
@@ -4,10 +4,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GHC=8.8.3
+ARG GHC=8.8.4
 ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
 ARG CABAL_INSTALL=3.2
-ARG STACK=2.3.1
+ARG STACK=2.3.3
 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
 
diff --git a/haskell_8.8/Dockerfile b/haskell_8.8/Dockerfile
index 973da94..d0fcda6 100644
--- a/haskell_8.8/Dockerfile
+++ b/haskell_8.8/Dockerfile
@@ -4,10 +4,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GHC=8.8.3
+ARG GHC=8.8.4
 ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
 ARG CABAL_INSTALL=3.2
-ARG STACK=2.3.1
+ARG STACK=2.3.3
 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
 
diff --git a/haskell_latest/Dockerfile b/haskell_latest/Dockerfile
index 4b60462..f3affa0 100644
--- a/haskell_latest/Dockerfile
+++ b/haskell_latest/Dockerfile
@@ -4,10 +4,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GHC=8.10.1
+ARG GHC=8.10.2
 ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
 ARG CABAL_INSTALL=3.2
-ARG STACK=2.3.1
+ARG STACK=2.3.3
 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
 
diff --git a/haskell_stretch/Dockerfile b/haskell_stretch/Dockerfile
index d4a716e..8c6372b 100644
--- a/haskell_stretch/Dockerfile
+++ b/haskell_stretch/Dockerfile
@@ -4,10 +4,10 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr && \
     rm -rf /var/lib/apt/lists/*
 
-ARG GHC=8.10.1
+ARG GHC=8.10.2
 ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
 ARG CABAL_INSTALL=3.2
-ARG STACK=2.3.1
+ARG STACK=2.3.3
 ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
 ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
 

@yosifkit yosifkit merged commit b2e0d5e into docker-library:master Aug 17, 2020
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