From 2f562ad66e96c97279574a2e4ebfbf176cb7eb87 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 14 Aug 2024 14:18:39 +0200 Subject: [PATCH] Bump Dockerfile for JDK build. See #93 --- Jenkinsfile | 8 ++++---- ci/Dockerfile | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index be66654..105c0af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,8 +21,8 @@ pipeline { stage('Build the Spring Data release tools container') { when { anyOf { - changeset 'ci/Dockerfile' - changeset 'ci/java-tools.properties' + changeset 'ci/Dockerfile' + changeset 'ci/java-tools.properties' } } agent { @@ -31,7 +31,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-release-tools:0.15", "ci") + def image = docker.build("springci/spring-data-release-tools:0.16", "ci") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } @@ -45,7 +45,7 @@ pipeline { } agent { docker { - image 'springci/spring-data-release-tools:0.15' + image 'springci/spring-data-release-tools:0.16' } } options { timeout(time: 4, unit: 'HOURS') } diff --git a/ci/Dockerfile b/ci/Dockerfile index 9f88ccf..4df6eb9 100755 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -7,6 +7,7 @@ ARG USER_UID="1001" ARG USER_GID="1001" ARG USER_NAME="jenkins" + RUN groupadd -g $USER_GID $USER_NAME && \ useradd -m -g $USER_GID -u $USER_UID $USER_NAME