From 24f5e407b2b5b96a2725bb26fc7e98166ea6b5ee Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 31 Mar 2022 11:39:56 +0200 Subject: [PATCH] Fix Java 11 build container name. See #2282 --- Jenkinsfile | 2 +- Makefile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 37061802c..f836fe282 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2:${p['java.11.tag']}", "--build-arg BASE=${p['docker.java.11.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk11-redis-6.2/Dockerfile .") + def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.11.tag']}", "--build-arg BASE=${p['docker.java.11.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk11-redis-6.2/Dockerfile .") docker.withRegistry(p['docker.registry'], p['docker.credentials']) { image.push() } diff --git a/Makefile b/Makefile index 88a99f4f5..dcfae4a4f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - REDIS_VERSION:=6.2.6 SPRING_PROFILE?=ci SHELL=/bin/bash -euo pipefail