fix: rc push

gosh-sh · Aug 23, 2022 · e3f5287 · e3f5287
1 parent 65a80f4
commit e3f5287
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/.ci/Jenkinsfile.gosh-release b/.ci/Jenkinsfile.gosh-release
@@ -31,12 +31,9 @@ pipeline {
                         withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'teamgosh-dockerhub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
                             sh 'docker login -u $USERNAME -p $PASSWORD'
                         }
-                        sh "docker pull localhost:5000/teamgosh/git:${VERSION}"
-                        sh "docker tag localhost:5000/teamgosh/git:${VERSION} teamgosh/git:${VERSION}"
-                        sh "docker push teamgosh/git:${VERSION}"
+                        sh "make publish FULL_IMAGE_NAME=teamgosh/git:${VERSION} PLATFORM=linux/amd64,linux/arm64"
                         if (params.LATEST) {
-                            sh "docker tag teamgosh/git:${VERSION} teamgosh/git:latest"
-                            sh "docker push teamgosh/git:latest"
+                            sh "make publish FULL_IMAGE_NAME=teamgosh/git:latest PLATFORM=linux/amd64,linux/arm64"
                         }
                     }
                 }
@@ -49,12 +46,9 @@ pipeline {
                         withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'teamgosh-dockerhub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
                             sh 'docker login -u $USERNAME -p $PASSWORD'
                         }
-                        sh "docker pull localhost:5000/teamgosh/docker-extension:${VERSION}"
-                        sh "docker tag localhost:5000/teamgosh/docker-extension:${VERSION} teamgosh/docker-extension:${VERSION}"
-                        sh "docker push teamgosh/docker-extension:${VERSION}"
+                        sh "make build-ci IMAGE=teamgosh/docker-extension TAG=${VERSION} PLATFORM=linux/amd64,linux/arm64 GOSH_GIT_IMAGE=localhost:5000/teamgosh/git:${VERSION}"
                         if (params.LATEST) {
-                            sh "docker tag teamgosh/docker-extension:${VERSION} teamgosh/docker-extension:latest"
-                            sh "docker push teamgosh/docker-extension:latest"
+                            sh "make build-ci IMAGE=teamgosh/docker-extension TAG=latest PLATFORM=linux/amd64,linux/arm64 GOSH_GIT_IMAGE=localhost:5000/teamgosh/git:${VERSION}"
                         }
                     }
                 }

diff --git a/docker-extension/Makefile b/docker-extension/Makefile
@@ -65,7 +65,7 @@ build: clean_temp prepare-builder build-ui-v2 build-gosh-git-image ## Build serv
 	  .
 
 build-ci: prepare-builder build-ui-v2
-	mkdir $(LOCAL_TEMP_DIR)/gosh
+	mkdir -p $(LOCAL_TEMP_DIR)/gosh
 	cp -r ../contracts/gosh/*.abi.json $(LOCAL_TEMP_DIR)/gosh/
 	${DOCKER_BUILDX} \
 	  --tag=$(IMAGE):$(TAG) \