From 6d3b725304ce234154aaae20d9be73389c727e93 Mon Sep 17 00:00:00 2001 From: Miraty Date: Mon, 27 Jan 2025 00:47:31 +0100 Subject: [PATCH] add arguments for alpine major version and mirror --- alpine.Containerfile | 4 ++++ base.yaml | 2 ++ upstream.sh | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/alpine.Containerfile b/alpine.Containerfile index 6114589..eef70be 100644 --- a/alpine.Containerfile +++ b/alpine.Containerfile @@ -1,6 +1,10 @@ FROM scratch ARG SYS ADD $SYS / +ARG ALPINE_MIRROR +ARG ALPINE_MAJOR +RUN echo "$ALPINE_MIRROR/v$ALPINE_MAJOR/main" > /etc/apk/repositories +RUN echo "$ALPINE_MIRROR/v$ALPINE_MAJOR/community" >> /etc/apk/repositories RUN apk upgrade -U RUN apk add shadow RUN \ diff --git a/base.yaml b/base.yaml index d5e1e56..090637f 100644 --- a/base.yaml +++ b/base.yaml @@ -6,6 +6,8 @@ services: build: args: SYS: $SYS + ALPINE_MIRROR: $ALPINE_MIRROR + ALPINE_MAJOR: $ALPINE_MAJOR dockerfile: alpine.Containerfile cpus: '0.5' mem_limit: 16mb diff --git a/upstream.sh b/upstream.sh index 3dabb50..10cad24 100755 --- a/upstream.sh +++ b/upstream.sh @@ -1,11 +1,13 @@ #!/usr/bin/env sh SFTPGO_VERSION=2.6.4 +#https://mirrors.alpinelinux.org/ +ALPINE_MIRROR=https://dl-cdn.alpinelinux.org/alpine ALPINE_MAJOR=3.21 ALPINE_MINOR=2 ALPINE_ARCH=x86_64 ALPINE_RELEASE=$ALPINE_MAJOR.$ALPINE_MINOR-$ALPINE_ARCH -wget --quiet --no-clobber https://dl-cdn.alpinelinux.org/alpine/v$ALPINE_MAJOR/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_RELEASE.tar.gz -wget --quiet --no-clobber https://dl-cdn.alpinelinux.org/alpine/v$ALPINE_MAJOR/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_RELEASE.tar.gz.asc +wget --quiet --no-clobber $ALPINE_MIRROR/v$ALPINE_MAJOR/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_RELEASE.tar.gz +wget --quiet --no-clobber $ALPINE_MIRROR/v$ALPINE_MAJOR/releases/$ALPINE_ARCH/alpine-minirootfs-$ALPINE_RELEASE.tar.gz.asc wget --quiet --no-clobber https://alpinelinux.org/keys/ncopa.asc sq cert import ncopa.asc sq verify --signature-file=alpine-minirootfs-$ALPINE_RELEASE.tar.gz.asc --signer 0482D84022F52DF1C4E7CD43293ACD0907D9495A alpine-minirootfs-$ALPINE_RELEASE.tar.gz @@ -14,9 +16,11 @@ sha256sum -c *.sha256 cat << EOF > .env SYS=alpine-minirootfs-$ALPINE_RELEASE.tar.gz SFTPGO_VERSION=$SFTPGO_VERSION +ALPINE_MIRROR=$ALPINE_MIRROR +ALPINE_MAJOR=$ALPINE_MAJOR PHP_VERSION=84 EOF # to generate checksums -#wget --quiet --no-clobber https://dl-cdn.alpinelinux.org/alpine/v$ALPINE_MAJOR/releases/$ALPINE_ARCH/alpine-minirootfs$ALPINE_RELEASE.tar.gz.sha256 -#sha256sum sftpgo-v$SFTPGO_VERSION.tar.gz > sftpgo-v$SFTPGO_VERSION.tar.gz.sha256 +wget --quiet --no-clobber https://dl-cdn.alpinelinux.org/alpine/v$ALPINE_MAJOR/releases/$ALPINE_ARCH/alpine-minirootfs$ALPINE_RELEASE.tar.gz.sha256 +sha256sum sftpgo-v$SFTPGO_VERSION.tar.gz > sftpgo-v$SFTPGO_VERSION.tar.gz.sha256