From af217c3e1ab79b9a6e7aa20e56c08b831173f27d Mon Sep 17 00:00:00 2001 From: Mira Ressel Date: Wed, 12 Apr 2023 15:04:23 +0200 Subject: [PATCH] feat(ci-linux): tag staging images with rust & debian version resolves paritytech/ci_cd/issues/776 --- .gitlab-ci.yml | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f11b77f1..0c59237c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -332,7 +332,30 @@ base-ci-linux: ci-linux: <<: *docker_build script: - - *push_to_staging + - buildah bud + --format=docker + --build-arg VCS_REF="$CI_COMMIT_SHA" + --build-arg BUILD_DATE="$(date +%Y%m%d)" + --build-arg REGISTRY_PATH="$REGISTRY_PATH" + --tag "$REGISTRY_PATH/$IMAGE_NAME:staging" + --file "dockerfiles/$IMAGE_NAME/Dockerfile" dockerfiles + + # spin up a temporary ci-linux container to extract the tag info + - CONTAINER_ID="$(REGISTRY_AUTH_FILE= buildah from --pull=false "$REGISTRY_PATH/$IMAGE_NAME:staging")" + # VERSION_TAG=- + - VERSION_TAG="$(buildah run "$CONTAINER_ID" -- + bash -c 'printf "%s-%s" "$(rustc --version | cut -d\ -f2)" "$(sed -ne "s/^VERSION_CODENAME=//p" /etc/os-release)"' + )" + - buildah rm "$CONTAINER_ID" + - buildah tag "$REGISTRY_PATH/$IMAGE_NAME:staging" "$REGISTRY_PATH/$IMAGE_NAME:$VERSION_TAG" + + - echo "$Docker_Hub_Pass_Parity" | + buildah login --username "$Docker_Hub_User_Parity" --password-stdin "$REGISTRY_NAME" + - buildah info + - buildah push --format=v2s2 "$REGISTRY_PATH/$IMAGE_NAME:staging" + - buildah push --format=v2s2 "$REGISTRY_PATH/$IMAGE_NAME:$VERSION_TAG" + - buildah logout "$REGISTRY_NAME" + ink-ci-linux: <<: *docker_build