From a1103c05a5c3ac9a998d6a0634ab134b553aa669 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 3 Dec 2023 23:55:49 +0800 Subject: [PATCH] Update ARM docker images --- docker/arm32v7/buster/Dockerfile | 8 ++++---- docker/arm64v8/buster/Dockerfile | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/arm32v7/buster/Dockerfile b/docker/arm32v7/buster/Dockerfile index 5f2e301..0af6803 100644 --- 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.19.4 -ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C +ARG GHCUP_VERSION=0.1.20.0 +ARG GPG_KEY="7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF" # install ghcup RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ @@ -43,9 +43,9 @@ RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ chmod +x /usr/bin/ghcup && \ rm -rf SHA256SUMS SHA256SUMS.sig -ARG GHC=8.10.7 +ARG GHC=9.2.8 ARG CABAL_INSTALL=3.6.2.0 -ARG STACK=2.9.1 +ARG STACK=2.13.1 ENV GHCUP_CURL_OPTS="--silent" ENV NO_COLOR=1 diff --git a/docker/arm64v8/buster/Dockerfile b/docker/arm64v8/buster/Dockerfile index f9bd0f2..32440b7 100644 --- 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.19.4 -ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C +ARG GHCUP_VERSION=0.1.20.0 +ARG GPG_KEY="7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF" # install ghcup RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ @@ -43,9 +43,9 @@ RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ chmod +x /usr/bin/ghcup && \ rm -rf SHA256SUMS SHA256SUMS.sig -ARG GHC=8.10.7 -ARG CABAL_INSTALL=3.6.2.0 -ARG STACK=2.9.1 +ARG GHC=9.4.8 +ARG CABAL_INSTALL=3.10.2.0 +ARG STACK=2.13.1 ENV GHCUP_CURL_OPTS="--silent" ENV NO_COLOR=1