Fix docker builds

Merge remote-tracking branch 'origin/pr/844'
2023-07-11 23:44:49 +08:00 · 2023-07-11 23:30:51 +08:00
6 changed files with 13 additions and 12 deletions
--- a/docker/alpine32/Dockerfile
+++ b/docker/alpine32/Dockerfile
@@ -37,8 +37,8 @@ RUN apk add --no-cache \
            xz-dev \
            ncurses-static

-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C

 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
--- a/docker/alpine64/Dockerfile
+++ b/docker/alpine64/Dockerfile
@@ -37,8 +37,9 @@ RUN apk add --no-cache \
            xz-dev \
            ncurses-static

-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C
+

 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
--- a/docker/arm32v7/buster/Dockerfile
+++ b/docker/arm32v7/buster/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update && \

 RUN update_opt.sh 11 1

-ARG GHCUP_VERSION=0.1.17.8
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C

 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
--- a/docker/arm32v7/focal/Dockerfile
+++ b/docker/arm32v7/focal/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update && \

 RUN update_opt.sh 9 1

-ARG GHCUP_VERSION=0.1.17.8
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C

 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
--- a/docker/arm64v8/buster/Dockerfile
+++ b/docker/arm64v8/buster/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update && \

 RUN update_opt.sh 11 1

-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C

 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
--- a/docker/arm64v8/focal/Dockerfile
+++ b/docker/arm64v8/focal/Dockerfile
@@ -29,8 +29,8 @@ RUN apt-get update && \

 RUN update_opt.sh 9 1

-ARG GHCUP_VERSION=0.1.18.0
-ARG GPG_KEY=7784930957807690A66EBDBE3786C5262ECB4A3F
+ARG GHCUP_VERSION=0.1.19.4
+ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C

 # install ghcup
 RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \
Author	SHA1	Message	Date
Julian Ospald	6d325a1804	Fix docker builds	2023-07-11 23:44:49 +08:00
Julian Ospald	a05f272b58	Merge remote-tracking branch 'origin/pr/844'	2023-07-11 23:30:51 +08:00