diff --git a/images/.utils/gitlab-ci.yaml b/images/.utils/gitlab-ci.yaml index ee56ffe8f714e81f52e47126e5fa3d99ab7682dc..c8fa48fb4c7ce2378a71d36ee2dc38115605cf1d 100644 --- a/images/.utils/gitlab-ci.yaml +++ b/images/.utils/gitlab-ci.yaml @@ -12,19 +12,22 @@ container-build-release: stage: build extends: .container-matrix image: - name: gcr.io/kaniko-project/executor:v1.9.1-debug + name: quay.io/containers/podman:v4.3.1 entrypoint: [""] + before_script: + - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - export $(cat "${CI_PROJECT_DIR}/images/${IMAGE}/.release") - - /kaniko/executor - --context "${CI_PROJECT_DIR}/images/${IMAGE}" - --dockerfile "${CI_PROJECT_DIR}/images/${IMAGE}/Dockerfile" + - podman image build --pull --label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/${IMAGE}" --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" --label "org.opencontainers.image.title=${IMAGE}" - --reproducible - --destination "quay.io/shivering-isles/${IMAGE}:${release}" - --destination "quay.io/shivering-isles/${IMAGE}:latest" + --format=docker + --timestamp="$(date -d "${CI_COMMIT_TIMESTAMP}" +%s)" + --tag "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_SHORT_SHA}" + "${CI_PROJECT_DIR}/images/${IMAGE}" + - podman push "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_SHORT_SHA}" "quay.io/shivering-isles/${IMAGE}:${release}" + - podman push "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_SHORT_SHA}" "quay.io/shivering-isles/${IMAGE}:latest" rules: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' changes: @@ -38,19 +41,22 @@ container-build-dev: stage: build extends: .container-matrix image: - name: gcr.io/kaniko-project/executor:v1.9.1-debug + name: quay.io/containers/podman:v4.3.1 entrypoint: [""] + before_script: + - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - /kaniko/executor - --context "${CI_PROJECT_DIR}/images/${IMAGE}" - --dockerfile "${CI_PROJECT_DIR}/images/${IMAGE}/Dockerfile" + - podman image build --pull --label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/${IMAGE}" --label "org.opencontainers.image.revision=$CI_COMMIT_SHA" --label "org.opencontainers.image.title=${IMAGE}" --label "quay.expires-after=12w" - --reproducible - --destination "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" - --destination "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_REF_SLUG}" + --format=docker + --timestamp="$(date -d "${CI_COMMIT_TIMESTAMP}" +%s)" + --tag "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_SHORT_SHA}" + "${CI_PROJECT_DIR}/images/${IMAGE}" + - podman push "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_SHORT_SHA}" "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" + - podman push "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_SHORT_SHA}" "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_REF_SLUG}" rules: - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' changes: