Skip to content

Commit e482a60

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #1214
1 parent 75244b4 commit e482a60

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ pipeline {
2323
stage('Publish JDK 17 + Cassandra 3.11') {
2424
when {
2525
anyOf {
26-
changeset "ci/openjdk17-8-cassandra-3.11/**"
27-
changeset "ci/pipeline.properties"
26+
changeset "ci/openjdk17-8-cassandra-3.11/**"
27+
changeset "ci/pipeline.properties"
2828
}
2929
}
3030
agent { label 'data' }
@@ -33,7 +33,7 @@ pipeline {
3333
steps {
3434
script {
3535
def image = docker.build("springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg CASSANDRA=${p['docker.cassandra.3.version']} ci/openjdk17-8-cassandra-3.11/")
36-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
36+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3737
image.push()
3838
}
3939
}
@@ -59,8 +59,8 @@ pipeline {
5959
}
6060
steps {
6161
script {
62-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
63-
docker.image('springci/spring-data-openjdk17-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
62+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
63+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
6464
sh 'mkdir -p /tmp/jenkins-home'
6565
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
6666
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
@@ -89,7 +89,7 @@ pipeline {
8989

9090
steps {
9191
script {
92-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
92+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9393
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
9494
sh 'mkdir -p /tmp/jenkins-home'
9595
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +

ci/openjdk17-8-cassandra-3.11/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ RUN set -eux; \
1414
chmod -R a+rwx /opt/cassandra; \
1515
useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker;
1616

17-
1817
RUN set -eux; \
19-
BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz'; \
18+
BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz'; \
2019
curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
2120
mkdir -p /opt/java/openjdk8; \
2221
cd /opt/java/openjdk8; \

0 commit comments

Comments
 (0)