From 3719527bb31d9eee5e0a07ad7e19e1c3f5ce3812 Mon Sep 17 00:00:00 2001 From: Sven Feyerabend Date: Fri, 28 May 2021 21:32:50 +0200 Subject: [PATCH] fix(CI): set default --- .gitlab-ci.yaml => .gitlab-ci.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) rename .gitlab-ci.yaml => .gitlab-ci.yml (53%) diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yml similarity index 53% rename from .gitlab-ci.yaml rename to .gitlab-ci.yml index 4ac3db5..bad74fa 100644 --- a/.gitlab-ci.yaml +++ b/.gitlab-ci.yml @@ -2,19 +2,21 @@ variables: STORAGE_DRIVER: "vfs" BUILDAH_FORMAT: "docker" -image: "quay.io/buildah/stable" -before_script: - - buildah login --u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - - source environment - - > - buildah bud - --pull - --build-arg "BASE=$BASE" - --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" . +default: + image: "quay.io/buildah/stable" + before_script: + - buildah login --u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY + - source environment + - > + buildah bud + --pull + --build-arg "BASE=$BASE" + --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: script: - buildah tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"