From b79526a715c27bb392aff49ebdd1613174154f24 Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Tue, 12 Dec 2023 10:04:10 -0600 Subject: [PATCH] Add support for s390x (#132) Signed-off-by: Byron Ruth --- 2.10.x/alpine3.18/Dockerfile | 1 + 2.9.x/alpine3.18/Dockerfile | 1 + update.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/2.10.x/alpine3.18/Dockerfile b/2.10.x/alpine3.18/Dockerfile index 6fbd212..cb0d85a 100644 --- a/2.10.x/alpine3.18/Dockerfile +++ b/2.10.x/alpine3.18/Dockerfile @@ -10,6 +10,7 @@ RUN set -eux; \ armv7) natsArch='arm7'; sha256='d96042f12ecc0578d193d5353c362a572384c6ad9a46db73b7cb5f28cb6e4ad2' ;; \ x86_64) natsArch='amd64'; sha256='91f5b493ce3151baa0b15d8bf093279dc94106dd56a201704a20de567607bcf7' ;; \ x86) natsArch='386'; sha256='a5cddcac9f8debaf45e7b9ba3960778b1c786020c690991094ce31d033ec7649' ;; \ + s390x) natsArch='s390x'; sha256='01138e819d34970c76d621464dc8e8dfce0e05a162b5c36e2a4aed6198c6aba6' ;; \ *) echo >&2 "error: $apkArch is not supported!"; exit 1 ;; \ esac; \ \ diff --git a/2.9.x/alpine3.18/Dockerfile b/2.9.x/alpine3.18/Dockerfile index 387e1b5..610c91a 100644 --- a/2.9.x/alpine3.18/Dockerfile +++ b/2.9.x/alpine3.18/Dockerfile @@ -10,6 +10,7 @@ RUN set -eux; \ armv7) natsArch='arm7'; sha256='514e4a1123f82b775d6b17a12d1a7ce10fa8b5a1b86b9a831c09b13a7e6bc9b0' ;; \ x86_64) natsArch='amd64'; sha256='f4d5dc256d758fa42e7cbf2ddcacc2edfc379bedc0bbdcf5fe6cb67ff3a82d7c' ;; \ x86) natsArch='386'; sha256='b477a8e9a28746fce5bdf5333d16469351de2294402085df81126e699399ec48' ;; \ + s390x) natsArch='s390x'; sha256='1b324741684fc7755769c0a212ddd97c2fa9241b5c29886d47d3982078bacf96' ;; \ *) echo >&2 "error: $apkArch is not supported!"; exit 1 ;; \ esac; \ \ diff --git a/update.py b/update.py index 77df22f..68f9905 100755 --- a/update.py +++ b/update.py @@ -73,7 +73,7 @@ def update_alpine_shasums(base_dir: str, new_ver: str, shasums: typing.Dict): with open(file, "r") as fd: data = fd.read() - for arch in ["arm64", "arm6", "arm7", "amd64", "386"]: + for arch in ["arm64", "arm6", "arm7", "amd64", "386", "s390x"]: key = f"nats-server-v{new_ver}-linux-{arch}.tar.gz" arch_sha = shasums.get(key) r = re.compile(f"(natsArch='{arch}'; )"+r"sha256='[A-Fa-f0-9]{64}'")