From afc785d6ab12a38354d60515c5e2827a9df7d228 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Wed, 16 Jun 2021 11:14:22 +0200 Subject: [PATCH] Simple CI --- .gitlab-ci.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6906687..7624739 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,15 @@ build-main: build: script: - - docker build --cache-from $CI_REGISTRY_IMAGE --build-arg BUILDKIT_INLINE_CACHE=1 --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" + - docker build + --build-arg BUILDKIT_INLINE_CACHE=1 + --build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}" + --build-arg login_text="${LOGIN_TEXT}" + --build-arg collab_text="${COLLAB_TEXT}" + --pull + --cache-from "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" + --cache-from "$CI_REGISTRY_IMAGE" + -t "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" . + - docker push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" except: - main