Switch Docker build CI config to our default
This commit is contained in:
parent
755a046698
commit
5b3648f502
1 changed files with 18 additions and 22 deletions
|
@ -1,33 +1,29 @@
|
||||||
variables:
|
# Official docker image.
|
||||||
STORAGE_DRIVER: "vfs"
|
image: docker:latest
|
||||||
BUILDAH_FORMAT: "docker"
|
|
||||||
|
|
||||||
default:
|
variables:
|
||||||
image: "quay.io/buildah/stable"
|
DOCKER_DRIVER: overlay2
|
||||||
before_script:
|
|
||||||
- buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
# Docker in Docker Service
|
||||||
- source environment
|
services:
|
||||||
- buildah pull $BASE
|
- docker:dind
|
||||||
- >
|
|
||||||
buildah bud
|
before_script:
|
||||||
--pull
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
--build-arg "BASE=$BASE"
|
- source environment
|
||||||
--build-arg "LDAP_PLUGIN_URL=$LDAP_PLUGIN_URL"
|
|
||||||
--build-arg login_text="${LOGIN_TEXT}"
|
|
||||||
--build-arg collab_text="${COLLAB_TEXT}"
|
|
||||||
--build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}"
|
|
||||||
-t "$CI_REGISTRY_IMAGE" .
|
|
||||||
|
|
||||||
build-main:
|
build-main:
|
||||||
script:
|
script:
|
||||||
- buildah tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
|
- docker build --no-cache --pull -t "$CI_REGISTRY_IMAGE" .
|
||||||
- buildah push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" "docker://$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
|
- docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
|
||||||
|
- docker push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
|
||||||
|
- docker push "$CI_REGISTRY_IMAGE"
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
build:
|
build:
|
||||||
script:
|
script:
|
||||||
- buildah tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
|
- docker build --no-cache --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
|
||||||
- buildah push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" "docker://$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
|
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
|
||||||
except:
|
except:
|
||||||
- main
|
- main
|
||||||
|
|
Loading…
Reference in a new issue