@@ -266,6 +266,7 @@ void vulnerabilityScan() {
266
266
void publishToInternalRegistry () {
267
267
withCredentials([usernamePassword(credentialsId : ' builder-credentials-artifactory' , passwordVariable : ' docker_password' , usernameVariable : ' docker_user' )]) {
268
268
sh """
269
+ docker logout ${ dockerRegistry}
269
270
echo "${ docker_password} " | docker login --username ${ docker_user} --password-stdin ${ dockerRegistry}
270
271
docker tag ${ builtImage} ${ dockerRegistry} /${ builtImage}
271
272
docker tag ${ builtImage} ${ dockerRegistry} /${ publishImage}
@@ -345,9 +346,7 @@ pipeline {
345
346
30 02 * * * % marklogicVersion=12;dockerImageType=ubi
346
347
30 02 * * * % marklogicVersion=12;dockerImageType=ubi-rootless;SCAP_SCAN=true
347
348
00 03 * * * % marklogicVersion=11;dockerImageType=ubi9
348
- 00 03 * * * % marklogicVersion=11;dockerImageType=ubi9-rootless;SCAP_SCAN=true
349
- 00 03 * * * % marklogicVersion=12;dockerImageType=ubi9
350
- 00 03 * * * % marklogicVersion=12;dockerImageType=ubi9-rootless;SCAP_SCAN=true''' : ' ' )
349
+ 00 03 * * * % marklogicVersion=11;dockerImageType=ubi9-rootless;SCAP_SCAN=true''' : ' ' )
351
350
}
352
351
environment {
353
352
QA_LICENSE_KEY = credentials(' QA_LICENSE_KEY' )
@@ -452,8 +451,7 @@ pipeline {
452
451
cd src
453
452
rm -rf *.rpm NOTICE.txt
454
453
docker stop $(docker ps -a -q) || true
455
- docker system prune --force --all
456
- docker volume prune --force --all
454
+ docker system prune --force --all --volumes
457
455
docker system df
458
456
'''
459
457
publishTestResults()
0 commit comments