From b5245988e0e7f0bbba75ca4a52a7f2cc1aba2c36 Mon Sep 17 00:00:00 2001 From: Oleksandr Yakushev Date: Tue, 23 Jul 2024 09:34:19 +0300 Subject: [PATCH] Use new Noble-based temurin images, remove Focal --- README.md | 2 +- src/docker_clojure/config.clj | 7 ++----- test/docker_clojure/core_test.clj | 16 ++++++++-------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 7aa16711..c9e77394 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ combination is provided upstream and thus likewise for us): Java 8 leiningen on Debian bullseye-slim: `clojure:temurin-8-lein-bullseye-slim` Java 11 leiningen on Debian bullseye: `clojure:temurin-11-lein-bullseye` -Java 17 tools-deps on Ubuntu focal: `clojure:tools-deps` or `clojure:temurin-17` or `clojure:temurin-17-tools-deps` or `clojure:temurin-17-tools-deps-focal` +Java 17 tools-deps on Ubuntu noble: `clojure:tools-deps` or `clojure:temurin-17` or `clojure:temurin-17-tools-deps` or `clojure:temurin-17-tools-deps-noble` Java 17 tools-deps on Debian bullseye-slim: `clojure:bullseye-slim` or `clojure:tools-deps-bullseye-slim` or `clojure:temurin-17-bullseye-slim` or `clojure:temurin-17-tools-deps-bullseye-slim` Java 21 tools-deps on Debian bookworm: `clojure:tools-deps` or `clojure:temurin-21-tools-deps` or `clojure:temurin-21-bookworm` Java 22 leiningen on Debian bookworm: `clojure:temurin-21-lein-bookworm` diff --git a/src/docker_clojure/config.clj b/src/docker_clojure/config.clj index 9b7eb026..83d9df51 100644 --- a/src/docker_clojure/config.clj +++ b/src/docker_clojure/config.clj @@ -51,7 +51,7 @@ (def distros "Map of base image name to set of distro tags to use, namespaced by Linux distro type. :default key is a fallback for base images not o/w specified." - {:default #{:alpine/alpine :ubuntu/focal :ubuntu/jammy} + {:default #{:alpine/alpine :ubuntu/jammy :ubuntu/noble} "debian" #{:debian-slim/bookworm-slim :debian/bookworm :debian-slim/bullseye-slim :debian/bullseye}}) @@ -84,10 +84,7 @@ "1.11.3.1456" "2f5edc801133c72a49e990816b0e245beb8b4e35a85524b4dd0b3fa03a4a5365"}}) (def exclusions ; don't build these for whatever reason(s) - #{; no more focal builds for JDK 20+ - {:jdk-version #(>= % 20) - :distro :ubuntu/focal} - ;; commented out example + #{;; commented out example #_{:jdk-version 8 :distro :alpine/alpine}}) diff --git a/test/docker_clojure/core_test.clj b/test/docker_clojure/core_test.clj index 337a2b17..d98e2404 100644 --- a/test/docker_clojure/core_test.clj +++ b/test/docker_clojure/core_test.clj @@ -9,7 +9,7 @@ (testing "generates the expected set of variants" (with-redefs [cfg/default-distros {8 :debian-slim/buster-slim 11 :debian-slim/buster-slim - :default :ubuntu/focal} + :default :ubuntu/noble} cfg/default-jdk-version 11 cfg/maintainers ["Paul Lam " "Wes Morgan "]] @@ -19,7 +19,7 @@ #{8 11 17 18} {"debian" #{:debian/buster :debian-slim/buster-slim} - :default #{:alpine/alpine :ubuntu/focal}} + :default #{:alpine/alpine :ubuntu/noble}} {"lein" "2.9.1" "tools-deps" "1.10.1.478"})] ;; filter is to make failure output a little more humane @@ -34,9 +34,9 @@ :base-image "debian" :base-image-tag "debian:buster-slim" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-11-lein-2.9.1", :build-tool-version "2.9.1"} - {:jdk-version 18, :distro :ubuntu/focal + {:jdk-version 18, :distro :ubuntu/noble :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:18-jdk-focal" + :base-image-tag "eclipse-temurin:18-jdk-noble" :build-tool "tools-deps" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-18-tools-deps-1.10.1.478" @@ -64,9 +64,9 @@ :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-8-tools-deps-1.10.1.478" :build-tool-version "1.10.1.478"} - {:jdk-version 17, :distro :ubuntu/focal, :build-tool "lein" + {:jdk-version 17, :distro :ubuntu/noble, :build-tool "lein" :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-focal" + :base-image-tag "eclipse-temurin:17-jdk-noble" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-17-lein-2.9.1" :build-tool-version "2.9.1"} @@ -76,9 +76,9 @@ :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-17-lein-2.9.1-alpine" :build-tool-version "2.9.1"} - {:jdk-version 17, :distro :ubuntu/focal + {:jdk-version 17, :distro :ubuntu/noble :base-image "eclipse-temurin" - :base-image-tag "eclipse-temurin:17-jdk-focal" + :base-image-tag "eclipse-temurin:17-jdk-noble" :build-tool "tools-deps" :maintainer "Paul Lam & Wes Morgan " :docker-tag "temurin-17-tools-deps-1.10.1.478"