From 4fcc710d889ce05eef89892dc9c5d9c705cf7b79 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 Nov 2024 10:51:38 +0100 Subject: [PATCH] Align Docker image naming with used JDK. See #1529 --- Jenkinsfile | 6 +++--- .../Dockerfile | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename ci/{openjdk21-8-cassandra-3.11 => openjdk23-8-cassandra-3.11}/Dockerfile (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 2f8e22932..82d4247f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,10 +38,10 @@ pipeline { } } } - stage('Publish JDK 21 + Cassandra 3.11') { + stage('Publish JDK.next + Cassandra 3.11') { when { anyOf { - changeset "ci/openjdk21-8-cassandra-3.11/**" + changeset "ci/openjdk23-8-cassandra-3.11/**" changeset "ci/pipeline.properties" } } @@ -49,7 +49,7 @@ pipeline { options { timeout(time: 30, unit: 'MINUTES') } steps { script { - def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk21-8-cassandra-3.11/") + def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk23-8-cassandra-3.11/") docker.withRegistry(p['docker.registry'], p['docker.credentials']) { image.push() } diff --git a/ci/openjdk21-8-cassandra-3.11/Dockerfile b/ci/openjdk23-8-cassandra-3.11/Dockerfile similarity index 100% rename from ci/openjdk21-8-cassandra-3.11/Dockerfile rename to ci/openjdk23-8-cassandra-3.11/Dockerfile