Skip to content

Commit 89b64f0

Browse files
committed
Polishing.
Extract Docker and Artifactory credentials into properties file. See #569
1 parent e81ce2f commit 89b64f0

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Jenkinsfile

+11-11
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ pipeline {
3030
}
3131
options { timeout(time: 30, unit: 'MINUTES') }
3232
environment {
33-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
33+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
3434
}
3535
steps {
3636
script {
37-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
37+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3838
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
3939
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
4040
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -63,11 +63,11 @@ pipeline {
6363
}
6464
options { timeout(time: 30, unit: 'MINUTES') }
6565
environment {
66-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
66+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
6767
}
6868
steps {
6969
script {
70-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
70+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7171
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
7272
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
7373
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -88,11 +88,11 @@ pipeline {
8888
}
8989
options { timeout(time: 30, unit: 'MINUTES') }
9090
environment {
91-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
91+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
9292
}
9393
steps {
9494
script {
95-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
95+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9696
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
9797
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
9898
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -122,12 +122,12 @@ pipeline {
122122
options { timeout(time: 20, unit: 'MINUTES') }
123123

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

128128
steps {
129129
script {
130-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
130+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
131131
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
132132
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
133133
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
@@ -158,13 +158,13 @@ pipeline {
158158
options { timeout(time: 20, unit: 'MINUTES') }
159159

160160
environment {
161-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
161+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
162162
}
163163

164164
steps {
165165
script {
166-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
167-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
166+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
167+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
168168
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
169169
'-Dartifactory.server=https://repo.spring.io ' +
170170
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)