Przeglądaj źródła

Add cr-test2 GCR project

Christopher Hoskin 8 lat temu
rodzic
commit
d182e5329c
2 zmienionych plików z 8 dodań i 0 usunięć
  1. 6 0
      services/filestore/Jenkinsfile
  2. 2 0
      services/filestore/Makefile

+ 6 - 0
services/filestore/Jenkinsfile

@@ -63,6 +63,12 @@ pipeline {
         sh 'DOCKER_REPO=gcr.io/csh-staging make publish'
         sh 'DOCKER_REPO=gcr.io/csh-staging make publish'
         sh 'docker logout https://gcr.io/csh-staging'
         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'
+        
       }
       }
     }
     }
 
 

+ 2 - 0
services/filestore/Makefile

@@ -18,6 +18,7 @@ clean:
 	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	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-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	docker rmi gcr.io/csh-staging/$(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 -f app.js
 	rm -rf app/js
 	rm -rf app/js
 	rm -rf test/unit/js
 	rm -rf test/unit/js
@@ -40,6 +41,7 @@ build:
 	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 	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-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		--tag gcr.io/csh-staging/$(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:
 publish: