Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

control-service: release job builder in 2 repos #2413

Merged
merged 1 commit into from
Jul 22, 2023
Merged

control-service: release job builder in 2 repos #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cicd/docker_push_vdk.sh
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions projects/control-service/projects/job-builder-secure/publish-vdk-job-builder-secure.sh
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion projects/control-service/projects/job-builder-secure/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.2
1.1.3
4 changes: 2 additions & 2 deletions projects/control-service/projects/job-builder/publish-vdk-job-builder.sh
View file
Open in desktop
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
antoniivanov marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.3
1.3.4
Loading