Consistent ordering or architectures, fix ppc checksum

caddyserver · Jun 4, 2024 · 645721b · 645721b
1 parent f3330aa
commit 645721b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/2.8/alpine/Dockerfile b/2.8/alpine/Dockerfile
@@ -25,8 +25,8 @@ RUN set -eux; \
 		armhf)   binArch='armv6'; checksum='640536eee0645342a8cb3bfe6ca3ad5bce8a22fee371eb295192d4e95971802a4f4dbe3a188d2be577762547f713e8ac708f8e9b6acf4806cdf509ce54954eac' ;; \
 		armv7)   binArch='armv7'; checksum='8aecf8866a6dbdc46d550d2d957afc26dd262a8fa1fd6feb122df961ef57d2301b720556e6ff180f1ea0ae19e13f1cc6ea9935eae58efb68b8821aebffe989f1' ;; \
 		aarch64) binArch='arm64'; checksum='5466234be3e988071cef937aedbdd94c15b6f75cf7307397e67c2641219ac9bfe2c2bb3b31fc05bc68d3b6398bbe50abfa16ccf3b127318ccac31115ad26507c' ;; \
-		ppc64el|ppc64le) binArch='ppc64le'; checksum='67ce559ca785f05b54b587f91f12f8c4c46a7d14e3f72772f14922b672417473b4e76ab61dd939b9b710889ca3a0604cd7f4c78ccba8e6dbfd5fd5193d9bf719' ;; \
-		riscv64) binArch='riscv64'; checksum='90c4a779f52b86d4b615a15acdec01db986a88fb606ca11145c21cfc4e64b417296fe0a54416f2c295600f8a2994a073a40028b1b1583403b416464bf39de173' ;; \
+		ppc64el|ppc64le) binArch='ppc64le'; checksum='90c4a779f52b86d4b615a15acdec01db986a88fb606ca11145c21cfc4e64b417296fe0a54416f2c295600f8a2994a073a40028b1b1583403b416464bf39de173' ;; \
+		riscv64) binArch='riscv64'; checksum='67ce559ca785f05b54b587f91f12f8c4c46a7d14e3f72772f14922b672417473b4e76ab61dd939b9b710889ca3a0604cd7f4c78ccba8e6dbfd5fd5193d9bf719' ;; \
 		s390x)   binArch='s390x'; checksum='ed67cecdb9f50379d75805ebeb687183f096d3206cef053b768e87eceb4472fd568f47ef8fe0939f019f38e298a3a41243ba9caa193f57e7b29e4daa700898bc' ;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
 	esac; \

diff --git a/2.8/builder/Dockerfile b/2.8/builder/Dockerfile
@@ -20,8 +20,8 @@ RUN set -eux; \
 		armhf)   binArch='armv6'; checksum='c0a94f2e59547fe5d4793ec2447ba0b832731c7b1387ae3c90e43f081da57ad68ab506de43ad91a35754a779b591dc5a39a92b6cf3b5ef352622cfb811e92157' ;; \
 		armv7)   binArch='armv7'; checksum='4820d03ed4a805cf52803725fd1eda9d96f15692ab3cd2803fe91e676f1a24a48b31c4e6a1ec043e5f7f077f302e003e4997ca620c9674ed65e7804417a91af6' ;; \
 		aarch64) binArch='arm64'; checksum='41033dc721e799583eac2014b6e409d65a704d0a4360c131662aa651e7fbd129dce03c460661a51e0ba192d27fb3af19faa054da8c037c642b24a12124f6d4a8' ;; \
-		ppc64el|ppc64le) binArch='ppc64le'; checksum='afaf940189942adfe0518d06b42f2624f387a02d88ce9ec5f8cc5a99347e032e2dcae3e3cd5856ac1a6ce107a7654e62b04f635f1dd891ca192b23758946b45b' ;; \
-		riscv64) binArch='riscv64'; checksum='ea454e90519f46eeaf785a5789d455a01378dc543838d0b57448509036f3a215913c8a6e1fcb0b9249e9b941f29a29257367609e1ef7ce7f2e0522c768eaf2cf' ;; \
+		ppc64el|ppc64le) binArch='ppc64le'; checksum='ea454e90519f46eeaf785a5789d455a01378dc543838d0b57448509036f3a215913c8a6e1fcb0b9249e9b941f29a29257367609e1ef7ce7f2e0522c768eaf2cf' ;; \
+		riscv64) binArch='riscv64'; checksum='afaf940189942adfe0518d06b42f2624f387a02d88ce9ec5f8cc5a99347e032e2dcae3e3cd5856ac1a6ce107a7654e62b04f635f1dd891ca192b23758946b45b' ;; \
 		s390x)   binArch='s390x'; checksum='d8d3bf402107dad8f07ed9d5df008b3f6cfd021c93d00f6fc31c641d69649255f2e95d65a46553fb06bf9738158d0ba92d3bbd548e878f4569523b6e6fdeacb5' ;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
 	esac; \

diff --git a/getChecksums.sh b/getChecksums.sh
@@ -42,8 +42,8 @@ archive_names=(
   linux_armv6.tar.gz
   linux_armv7.tar.gz
   linux_arm64.tar.gz
-  linux_riscv64.tar.gz
   linux_ppc64le.tar.gz
+  linux_riscv64.tar.gz
   linux_s390x.tar.gz
   windows_amd64.zip
 )

diff --git a/library/caddy b/library/caddy
@@ -9,14 +9,14 @@ SharedTags: 2.8.4, 2.8, 2, latest
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/alpine
 GitCommit: fb6e8723745c60fe413a311b484704e8ce3fcfd3
-Architectures: amd64, arm64v8, arm32v6, arm32v7, riscv64, ppc64le, s390x
+Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x
 
 Tags: 2.8.4-builder-alpine, 2.8-builder-alpine, 2-builder-alpine, builder-alpine
 SharedTags: 2.8.4-builder, 2.8-builder, 2-builder, builder
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/builder
 GitCommit: fb6e8723745c60fe413a311b484704e8ce3fcfd3
-Architectures: amd64, arm64v8, arm32v6, arm32v7, riscv64, ppc64le, s390x
+Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x
 
 Tags: 2.8.4-windowsservercore-1809, 2.8-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
 SharedTags: 2.8.4-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, windowsservercore, 2.8.4, 2.8, 2, latest

diff --git a/stackbrew-config.yaml b/stackbrew-config.yaml
@@ -10,11 +10,11 @@ variants:
   - dir: alpine
     tags: [ "alpine" ]
     shared_tags: [ "latest" ]
-    architectures: [ amd64, arm64v8, arm32v6, arm32v7, riscv64, ppc64le, s390x ]
+    architectures: [ amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x ]
   - dir: builder
     tags: [ "builder-alpine" ]
     shared_tags: [ "builder" ]
-    architectures: [ amd64, arm64v8, arm32v6, arm32v7, riscv64, ppc64le, s390x ]
+    architectures: [ amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x ]
   - dir: windows/1809
     base_file: Dockerfile.windowsservercore-1809.base
     tags: [ "windowsservercore-1809" ]