[ci] Update buildah command and version (#531)

This commit is contained in:
Alexander Samusev authored and GitHub committed 2023-04-21 12:27:36 +01:00
1 parent 3828898c20
commit 632ce6557a
1 file changed
+8 -6
+8 -6
View File
@@ -28,6 +28,8 @@ variables:
## DO NOT SET THEM IN THIS FILE!! They've been mentioned here only for documentation purposes! ## DO NOT SET THEM IN THIS FILE!! They've been mentioned here only for documentation purposes!
FORCE_DEPLOY: "" # boolean: true or false - triggers the deploy-production stage FORCE_DEPLOY: "" # boolean: true or false - triggers the deploy-production stage
FORCE_DOCKER_TAG: "" # choose an existing docker tag to be deployed (e.g. v1.2.3) FORCE_DOCKER_TAG: "" # choose an existing docker tag to be deployed (e.g. v1.2.3)
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
default: default:
before_script: before_script:
@@ -58,17 +60,17 @@ stages:
# Pipeline Job Templates: # Pipeline Job Templates:
.dockerize: &dockerize .dockerize: &dockerize
stage: build stage: build
image: quay.io/buildah/stable:v1.27 image: $BUILDAH_IMAGE
script: script:
- |- - |-
echo building "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" echo building "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
if [[ $BUILD_LATEST_IMAGE ]]; then if [[ $BUILD_LATEST_IMAGE ]]; then
buildah bud \ $BUILDAH_COMMAND build \
--format=docker \ --format=docker \
--tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" \ --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" \
--tag "$CONTAINER_REPO:latest" "$DOCKERFILE_DIRECTORY" --tag "$CONTAINER_REPO:latest" "$DOCKERFILE_DIRECTORY"
else else
buildah bud \ $BUILDAH_COMMAND build \
--format=docker \ --format=docker \
--tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" "$DOCKERFILE_DIRECTORY" --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" "$DOCKERFILE_DIRECTORY"
fi fi
@@ -77,10 +79,10 @@ stages:
- |- - |-
echo pushing "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" echo pushing "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
if [[ $BUILD_LATEST_IMAGE ]]; then if [[ $BUILD_LATEST_IMAGE ]]; then
buildah push --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" $BUILDAH_COMMAND build --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
buildah push --format=v2s2 "$CONTAINER_REPO:latest" $BUILDAH_COMMAND build --format=v2s2 "$CONTAINER_REPO:latest"
else else
buildah push --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" $BUILDAH_COMMAND build --format=v2s2 "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
fi fi
rules: rules:
- if: '$FORCE_DOCKER_TAG' - if: '$FORCE_DOCKER_TAG'