@@ -20,10 +20,10 @@ pipeline {
2020 stages {
2121 stage(" Docker Images" ) {
2222 parallel {
23- stage(' Publish JDK 17 + Redis 6.2 Docker Image' ) {
23+ stage(' Publish JDK 25 + Redis 6.2 Docker Image' ) {
2424 when {
2525 anyOf {
26- changeset " ci/openjdk17 -redis-6.2/Dockerfile"
26+ changeset " ci/openjdk25 -redis-6.2/Dockerfile"
2727 changeset " Makefile"
2828 changeset " ci/pipeline.properties"
2929 }
@@ -33,17 +33,17 @@ pipeline {
3333
3434 steps {
3535 script {
36- def image = docker. build(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg VERSION=${ p['docker.redis.6.version']} -f ci/openjdk17 -redis-6.2/Dockerfile ." )
36+ def image = docker. build(" springci/spring-data-with-redis-6.2:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg VERSION=${ p['docker.redis.6.version']} -f ci/openjdk25 -redis-6.2/Dockerfile ." )
3737 docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
3838 image. push()
3939 }
4040 }
4141 }
4242 }
43- stage(' Publish JDK 17 + Redis 7.2 Docker Image' ) {
43+ stage(' Publish JDK 25 + Redis 7.2 Docker Image' ) {
4444 when {
4545 anyOf {
46- changeset " ci/openjdk17 -redis-7.2/Dockerfile"
46+ changeset " ci/openjdk25 -redis-7.2/Dockerfile"
4747 changeset " Makefile"
4848 changeset " ci/pipeline.properties"
4949 }
@@ -53,17 +53,17 @@ pipeline {
5353
5454 steps {
5555 script {
56- def image = docker. build(" springci/spring-data-with-redis-7.2:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg VERSION=${ p['docker.redis.7.version']} -f ci/openjdk17 -redis-7.2/Dockerfile ." )
56+ def image = docker. build(" springci/spring-data-with-redis-7.2:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg VERSION=${ p['docker.redis.7.version']} -f ci/openjdk25 -redis-7.2/Dockerfile ." )
5757 docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
5858 image. push()
5959 }
6060 }
6161 }
6262 }
63- stage(' Publish JDK 17 + Valkey 8.0 Docker Image' ) {
63+ stage(' Publish JDK 25 + Valkey 8.0 Docker Image' ) {
6464 when {
6565 anyOf {
66- changeset " ci/openjdk17 -valkey-8.0/Dockerfile"
66+ changeset " ci/openjdk25 -valkey-8.0/Dockerfile"
6767 changeset " Makefile"
6868 changeset " ci/pipeline.properties"
6969 }
@@ -73,27 +73,7 @@ pipeline {
7373
7474 steps {
7575 script {
76- def image = docker. build(" springci/spring-data-with-valkey-8.0:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg VERSION=${ p['docker.valkey.8.version']} -f ci/openjdk17-valkey-8.0/Dockerfile ." )
77- docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
78- image. push()
79- }
80- }
81- }
82- }
83- stage(' Publish JDK 21 + Redis 6.2 Docker Image' ) {
84- when {
85- anyOf {
86- changeset " ci/openjdk21-redis-6.2/Dockerfile"
87- changeset " Makefile"
88- changeset " ci/pipeline.properties"
89- }
90- }
91- agent { label ' data' }
92- options { timeout(time : 20 , unit : ' MINUTES' ) }
93-
94- steps {
95- script {
96- def image = docker. build(" springci/spring-data-with-redis-6.2:${ p['java.next.tag']} " , " --build-arg BASE=${ p['docker.java.next.image']} --build-arg VERSION=${ p['docker.redis.6.version']} -f ci/openjdk21-redis-6.2/Dockerfile ." )
76+ def image = docker. build(" springci/spring-data-with-valkey-8.0:${ p['java.main.tag']} " , " --build-arg BASE=${ p['docker.java.main.image']} --build-arg VERSION=${ p['docker.valkey.8.version']} -f ci/openjdk25-valkey-8.0/Dockerfile ." )
9777 docker. withRegistry(p[' docker.registry' ], p[' docker.credentials' ]) {
9878 image. push()
9979 }
0 commit comments