control-service: release job builder in 2 repos

This is releasing job-builder image in both official repo and CICD repo to avoid docker limits
vmware · Jul 21, 2023 · bbbb223 · bbbb223
1 parent d471dd4
commit bbbb223
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/cicd/docker_push_vdk.sh b/cicd/docker_push_vdk.sh
@@ -34,7 +34,7 @@ function push_image_to_vdk_registries() {
   if [ -z "${VDK_REGISTRIES}" ]; then
       export VDK_REGISTRIES=(
         "${VDK_DOCKER_REGISTRY_URL} ${VDK_DOCKER_REGISTRY_USERNAME} ${VDK_DOCKER_REGISTRY_PASSWORD}"
-        "${CICD_CONTAINER_REGISTRY_URI} ${CICD_CONTAINER_REGISTRY_USER_NAME} ${CICD_CONTAINER_REGISTRY_USER_PASSWORD}"
+        "${CICD_CONTAINER_REGISTRY_URI}/versatiledatakit ${CICD_CONTAINER_REGISTRY_USER_NAME} ${CICD_CONTAINER_REGISTRY_USER_PASSWORD}"
         )
   fi
 

diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml
@@ -249,7 +249,7 @@ control_service_publish_python_image_secure_3_11:
     PYTHON_PATCH: 3
 
 control_service_publish_job_builder_image:
-  extends: .images:dind
+  extends: .images:dind:docker-push-to-vdk-repos
   stage: publish_artifacts
   script:
     - apk add --no-cache bash
@@ -260,7 +260,7 @@ control_service_publish_job_builder_image:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
       when: never
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
       changes:
         - projects/control-service/projects/job-builder/version.txt
 

diff --git a/projects/control-service/projects/job-builder-secure/publish-vdk-job-builder-secure.sh b/projects/control-service/projects/job-builder-secure/publish-vdk-job-builder-secure.sh
@@ -16,8 +16,8 @@ function build_and_push_image() {
     image_tag="$image_repo:$VERSION_TAG"
 
     docker build -t $image_tag -t $image_repo:latest -f "$SCRIPT_DIR/$docker_file" $arguments "$SCRIPT_DIR"
-    docker push $image_tag
-    docker push $image_repo:latest
+    docker_push_vdk.sh $image_tag
+    docker_push_vdk.sh $image_repo:latest
 }
 
 build_and_push_image "job-builder-secure" Dockerfile
diff --git a/projects/control-service/projects/job-builder-secure/version.txt b/projects/control-service/projects/job-builder-secure/version.txt
@@ -1 +1 @@
-1.1.2
+1.1.3
diff --git a/projects/control-service/projects/job-builder/publish-vdk-job-builder.sh b/projects/control-service/projects/job-builder/publish-vdk-job-builder.sh
@@ -16,8 +16,8 @@ function build_and_push_image() {
     image_tag="$image_repo:$VERSION_TAG"
 
     docker build -t $image_tag -t $image_repo:latest -f "$SCRIPT_DIR/$docker_file" $arguments "$SCRIPT_DIR"
-    docker push $image_tag
-    docker push $image_repo:latest
+    docker_push_vdk.sh $image_tag
+    docker_push_vdk.sh $image_repo:latest
 }
 
 build_and_push_image "job-builder" Dockerfile
diff --git a/projects/control-service/projects/job-builder/version.txt b/projects/control-service/projects/job-builder/version.txt
@@ -1 +1 @@
-1.3.3
+1.3.4