From a93fbf8494a3fb44a28667c6e53c3c7c9c0bf1c4 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 3 Sep 2026 09:40:08 -0600 Subject: [PATCH] Remove s390x architecture --- src/docker_clojure/config.clj | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index cb16823e..7f9f093e 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -112,7 +112,7 @@ :debian-slim/trixie-slim :debian/trixie}}) (def architectures - #{"amd64" "arm64v8" "ppc64le" "s390x"}) + #{"amd64" "arm64v8" "ppc64le"}) (def default-distros "The default distro to use for tags that don't specify one, keyed by jdk-version. @@ -151,25 +151,6 @@ :distro :alpine/alpine} ;; ppc64le needs Debian Bookworm or newer {:architecture "ppc64le" - :distro #(and (-> % namespace (str/starts-with? "debian")) - (-> % name (str/starts-with? "bullseye")))} - ;; riscv64 is only supported for Java 17+ - {:architecture "riscv64" - :jdk-version #(< % 17)} - ;; riscv64 isn't supported on Ubuntu Jammy - {:architecture "riscv64" - :distro :ubuntu/jammy} - ;; riscv64 needs Debian Trixie or newer - {:architecture "riscv64" - :distro #(and (-> % namespace (str/starts-with? "debian")) - (let [n (name %)] - (or (str/starts-with? n "bullseye") - (str/starts-with? n "bookworm"))))} - ;; s390x is only supported for Java 11+ - {:architecture "s390x" - :jdk-version #(< % 11)} - ;; s390x needs Debian Bookworm or newer - {:architecture "s390x" :distro #(and (-> % namespace (str/starts-with? "debian")) (-> % name (str/starts-with? "bullseye")))}})