From d182e5329ce661a1547de0008e34a24f75e93ade Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 17 Jul 2018 10:52:20 +0100 Subject: [PATCH] Add cr-test2 GCR project --- services/filestore/Jenkinsfile | 6 ++++++ services/filestore/Makefile | 2 ++ 2 files changed, 8 insertions(+) diff --git a/services/filestore/Jenkinsfile b/services/filestore/Jenkinsfile index 6aa3f14577..36e287d333 100644 --- a/services/filestore/Jenkinsfile +++ b/services/filestore/Jenkinsfile @@ -63,6 +63,12 @@ pipeline { sh 'DOCKER_REPO=gcr.io/csh-staging make publish' sh 'docker logout https://gcr.io/csh-staging' + withCredentials([file(credentialsId: 'gcr.io_cr-test2', variable: 'DOCKER_REPO_KEY_PATH')]) { + sh 'docker login -u _json_key --password-stdin https://gcr.io/cr-test2 < ${DOCKER_REPO_KEY_PATH}' + } + sh 'DOCKER_REPO=gcr.io/cr-test2 make publish' + sh 'docker logout https://gcr.io/cr-test2' + } } diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 8a76ec6069..12f0541e04 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -18,6 +18,7 @@ clean: docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker rmi gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) docker rmi gcr.io/csh-staging/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + docker rmi gcr.io/cr-test2/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) rm -f app.js rm -rf app/js rm -rf test/unit/js @@ -40,6 +41,7 @@ build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/csh-staging/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag gcr.io/cr-test2/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ . publish: