Skip to content

Commit

Permalink
control-service: release job builder in 2 repos (#2413)
Browse files Browse the repository at this point in the history
This is releasing job-builder image in both official repo and CICD repo
to avoid docker limits

Testing Done: temporarily enabled running the publish phase on this PR
and verified it published. See
https://gitlab.com/vmware-analytics/versatile-data-kit/-/pipelines/940105722
  • Loading branch information
antoniivanov committed Jul 22, 2023
1 parent ac1c9ba commit 1be736a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cicd/docker_push_vdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion projects/control-service/cicd/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.2
1.1.3
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion projects/control-service/projects/job-builder/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.3
1.3.4

0 comments on commit 1be736a

Please sign in to comment.