Skip to content

Commit 63ad671

Browse files
rwinieskirwinieski
authored
MLE-32135 : remove PDC sandbox and exclude ARM to be pushed to PDC (#475)
* remove PDC sandbox and exclude ARM to be pushed to PDC
1 parent 0e3c161 commit 63ad671

7 files changed

Lines changed: 15 additions & 25 deletions

File tree

‎Jenkinsfile‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import groovy.json.JsonSlurperClassic
99

1010
gitCredID = 'marklogic-builder-github'
1111
dockerRegistry = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com'
12-
pdcSbRegistry = 'sandboxpdc.azurecr.io'
1312
pdcDevRegistry = 'marklogicclouddev.azurecr.io'
1413
JIRA_ID_PATTERN = /(?i)(MLE)-\d{3,6}/
1514
JIRA_ID = ''
@@ -419,7 +418,7 @@ void vulnerabilityScan() {
419418

420419
/**
421420
* Publishes the built Docker image to the internal Artifactory registry.
422-
* Also publishes ML12 images to private Azure ACR repositories (PDC).
421+
* Also publishes ML images to private Azure ACR repositories (PDC).
423422
* Tags the image with multiple tags (version-specific, branch-specific, latest).
424423
* Requires Artifactory and Azure ACR credentials.
425424
*/
@@ -443,26 +442,17 @@ void publishToInternalRegistry() {
443442
}
444443

445444
// Publish to private ACR repositories that are used by PDC.
446-
// Publish to Sandbox PDC registry
447-
withCredentials([usernamePassword(credentialsId: 'PDC_SANDBOX_USER', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
445+
// Publish to Dev PDC registry (ARM images are excluded)
446+
if (!isArmImage()) {
447+
withCredentials([usernamePassword(credentialsId: 'pdc-azure-cr', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
448448
sh """
449-
echo "${docker_password}" | docker login --username ${docker_user} --password-stdin ${pdcSbRegistry}
450-
docker tag ${imageToPublish} ${pdcSbRegistry}/ml-docker-nightly:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion}
451-
docker tag ${imageToPublish} ${pdcSbRegistry}/ml-docker-nightly:${marklogicVersion}-${env.dockerImageType}
452-
docker push ${pdcSbRegistry}/ml-docker-nightly:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion}
453-
docker push ${pdcSbRegistry}/ml-docker-nightly:${marklogicVersion}-${env.dockerImageType}
449+
echo "${docker_password}" | docker login --username ${docker_user} --password-stdin ${pdcDevRegistry}
450+
docker tag ${imageToPublish} ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion}
451+
docker tag ${imageToPublish} ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}
452+
docker push ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion}
453+
docker push ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}
454454
"""
455455
}
456-
457-
// Publish to Dev PDC registry
458-
withCredentials([usernamePassword(credentialsId: 'pdc-azure-cr', passwordVariable: 'docker_password', usernameVariable: 'docker_user')]) {
459-
sh """
460-
echo "${docker_password}" | docker login --username ${docker_user} --password-stdin ${pdcDevRegistry}
461-
docker tag ${imageToPublish} ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion}
462-
docker tag ${imageToPublish} ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}
463-
docker push ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}-${env.dockerVersion}
464-
docker push ${pdcDevRegistry}/marklogicdb-custom:${marklogicVersion}-${env.dockerImageType}
465-
"""
466456
}
467457

468458
// Publish to Kubernetes ECR for testing on EKS

‎docker-compose/marklogic-multi-node.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
1+
# Copyright (c) 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
22
#Docker compose file sample to setup a three node cluster
33
version: '3.6'
44
services:

‎docker-compose/marklogic-single-node.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
1+
# Copyright (c) 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
22
#Docker compose file sample to setup single node cluster
33
version: '3.6'
44
services:

‎dockerFiles/marklogic-server-ubi-rootless:base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###############################################################
22
#
3-
# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
3+
# Copyright (c) 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
44
#
55
###############################################################
66

‎dockerFiles/marklogic-server-ubi:base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###############################################################
22
#
3-
# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
3+
# Copyright (c) 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
44
#
55
###############################################################
66

‎src/scripts/start-marklogic-rootless.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/bash
22
###############################################################
33
#
4-
# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
4+
# Copyright (c) 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
55
#
66
###############################################################
77
# Initialise and start MarkLogic server

‎src/scripts/start-marklogic.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/bash
22
###############################################################
33
#
4-
# Copyright (c) 2018-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
4+
# Copyright (c) 2018-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
55
#
66
###############################################################
77
# Initialise and start MarkLogic server

0 commit comments

Comments
 (0)