diff --git a/cicd/docker_push_vdk.sh b/cicd/docker_push_vdk.sh index 608b92c00f..de1796e874 100755 --- 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 index 327795d009..a8067cd6ae 100644 --- 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 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 index 0ec372c8dd..4164472dc3 100755 --- 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 index 45a1b3f445..781dcb07cd 100644 --- 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 index 4b1d329b40..842aae0f8e 100755 --- 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 index 31e5c84349..d0149fef74 100644 --- 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