Skip to content
Snippets Groups Projects
Verified Commit 9f47807d authored by Sheogorath's avatar Sheogorath :european_castle:
Browse files

ci(images): Switch entire build tooling to use podman

This patch drops kaniko from the container building toolchain, after more
problems with paths in the koolbox image.
parent 8d0aae87
No related branches found
No related tags found
No related merge requests found
Pipeline #16375 passed
...@@ -12,19 +12,22 @@ container-build-release: ...@@ -12,19 +12,22 @@ container-build-release:
stage: build stage: build
extends: .container-matrix extends: .container-matrix
image: image:
name: gcr.io/kaniko-project/executor:v1.9.1-debug name: quay.io/containers/podman:v4.3.1
entrypoint: [""] entrypoint: [""]
before_script:
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- export $(cat "${CI_PROJECT_DIR}/images/${IMAGE}/.release") - export $(cat "${CI_PROJECT_DIR}/images/${IMAGE}/.release")
- /kaniko/executor - podman image build --pull
--context "${CI_PROJECT_DIR}/images/${IMAGE}"
--dockerfile "${CI_PROJECT_DIR}/images/${IMAGE}/Dockerfile"
--label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/${IMAGE}" --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.revision=$CI_COMMIT_SHA"
--label "org.opencontainers.image.title=${IMAGE}" --label "org.opencontainers.image.title=${IMAGE}"
--reproducible --format=docker
--destination "quay.io/shivering-isles/${IMAGE}:${release}" --timestamp="$(date -d "${CI_COMMIT_TIMESTAMP}" +%s)"
--destination "quay.io/shivering-isles/${IMAGE}:latest" --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: rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
changes: changes:
...@@ -38,19 +41,22 @@ container-build-dev: ...@@ -38,19 +41,22 @@ container-build-dev:
stage: build stage: build
extends: .container-matrix extends: .container-matrix
image: image:
name: gcr.io/kaniko-project/executor:v1.9.1-debug name: quay.io/containers/podman:v4.3.1
entrypoint: [""] entrypoint: [""]
before_script:
- podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- /kaniko/executor - podman image build --pull
--context "${CI_PROJECT_DIR}/images/${IMAGE}"
--dockerfile "${CI_PROJECT_DIR}/images/${IMAGE}/Dockerfile"
--label "org.opencontainers.image.source=$CI_PROJECT_URL/-/tree/$CI_COMMIT_SHA/images/${IMAGE}" --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.revision=$CI_COMMIT_SHA"
--label "org.opencontainers.image.title=${IMAGE}" --label "org.opencontainers.image.title=${IMAGE}"
--label "quay.expires-after=12w" --label "quay.expires-after=12w"
--reproducible --format=docker
--destination "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}" --timestamp="$(date -d "${CI_COMMIT_TIMESTAMP}" +%s)"
--destination "quay.io/shivering-isles/${IMAGE}:${CI_COMMIT_REF_SLUG}" --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: rules:
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"' - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
changes: changes:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment