Skip to content

Commit b02f0eb

Browse files
committed
Polishing.
Extract Docker and Artifactory credentials into properties file. See #2471
1 parent 92198fe commit b02f0eb

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Jenkinsfile

+13-13
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ pipeline {
3131
options { timeout(time: 30, unit: 'MINUTES') }
3232

3333
environment {
34-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
35-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
34+
DOCKER_HUB = credentials("${p['docker.credentials']}")
35+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
3636
}
3737

3838
steps {
3939
script {
40-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
40+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
4141
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
4242
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
4343
sh "PROFILE=none ci/test.sh"
@@ -63,13 +63,13 @@ pipeline {
6363
options { timeout(time: 30, unit: 'MINUTES') }
6464

6565
environment {
66-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
67-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
66+
DOCKER_HUB = credentials("${p['docker.credentials']}")
67+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
6868
}
6969

7070
steps {
7171
script {
72-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
72+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7373
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) {
7474
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
7575
sh "PROFILE=java11 ci/test.sh"
@@ -87,13 +87,13 @@ pipeline {
8787
options { timeout(time: 30, unit: 'MINUTES') }
8888

8989
environment {
90-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
91-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
90+
DOCKER_HUB = credentials("${p['docker.credentials']}")
91+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
9292
}
9393

9494
steps {
9595
script {
96-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
96+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9797
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.docker']) {
9898
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
9999
sh "PROFILE=java11 ci/test.sh"
@@ -119,12 +119,12 @@ pipeline {
119119
options { timeout(time: 20, unit: 'MINUTES') }
120120

121121
environment {
122-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
122+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
123123
}
124124

125125
steps {
126126
script {
127-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
127+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
128128
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
129129
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
130130
'-Dartifactory.server=https://repo.spring.io ' +
@@ -150,12 +150,12 @@ pipeline {
150150
options { timeout(time: 20, unit: 'MINUTES') }
151151

152152
environment {
153-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
153+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
154154
}
155155

156156
steps {
157157
script {
158-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
158+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
159159
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
160160
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
161161
'-Dartifactory.server=https://repo.spring.io ' +

0 commit comments

Comments
 (0)