Skip to content

Commit af46811

Browse files
mp911desothawo
authored andcommitted
Polishing.
Extract Docker and Artifactory credentials into properties file. See #2074
1 parent fd5bb51 commit af46811

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Diff for: Jenkinsfile

+7-7
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/verify.sh'
@@ -61,12 +61,12 @@ pipeline {
6161
options { timeout(time: 20, unit: 'MINUTES') }
6262

6363
environment {
64-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
64+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
6565
}
6666

6767
steps {
6868
script {
69-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
69+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7070
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
7171
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-elasticsearch-non-root ' +
7272
'-Dartifactory.server=https://repo.spring.io ' +
@@ -91,12 +91,12 @@ pipeline {
9191
options { timeout(time: 20, unit: 'MINUTES') }
9292

9393
environment {
94-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
94+
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
9595
}
9696

9797
steps {
9898
script {
99-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
99+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
100100
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
101101
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-elasticsearch-non-root ' +
102102
'-Dartifactory.server=https://repo.spring.io ' +

0 commit comments

Comments
 (0)