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

Merge branch 'fix/gitlab-registry'

parents e8f2aae2 cee99ba9
No related branches found
No related tags found
1 merge request!8template: add '--format docker' as default build arg
Pipeline #10924 canceled
...@@ -7,6 +7,8 @@ variables: ...@@ -7,6 +7,8 @@ variables:
container-build: container-build:
stage: build stage: build
variables:
CI_REGISTRY_CONTAINER_FORMAT: "docker"
inherit: inherit:
default: false default: false
variables: variables:
...@@ -24,7 +26,7 @@ container-build: ...@@ -24,7 +26,7 @@ container-build:
- export VCS_URL=$CI_PROJECT_URL - export VCS_URL=$CI_PROJECT_URL
script: script:
- si-fix "${CI_REGISTRY_BUILD_DOCKERFILE:-./Dockerfile}" - si-fix "${CI_REGISTRY_BUILD_DOCKERFILE:-./Dockerfile}"
- podman build --pull - podman build --pull --format "$CI_REGISTRY_CONTAINER_FORMAT"
--label "org.opencontainers.image.source=$CI_PROJECT_URL" --label "org.opencontainers.image.source=$CI_PROJECT_URL"
--label "org.opencontainers.image.revision=$CI_COMMIT_SHA" --label "org.opencontainers.image.revision=$CI_COMMIT_SHA"
--label "org.opencontainers.image.created=$(date --rfc-3339 ns)" --label "org.opencontainers.image.created=$(date --rfc-3339 ns)"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment