From c18da5f72fb303d790c1d7b0beec746a334ccf90 Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Mon, 14 Jun 2021 21:39:28 +0200
Subject: [PATCH] Actually use environment variables as build args
---
.gitlab-ci.yml | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac36b1b..dcfa741 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,23 +16,32 @@ before_script:
build-main:
script:
- - docker build --cache-from $CI_REGISTRY_IMAGE:stage-src
+ - docker build
+ --build-arg BUILDKIT_INLINE_CACHE=1
+ --build-arg LDAP_PLUGIN_URL=$LDAP_PLUGIN_URL
+ --pull
+ --cache-from $CI_REGISTRY_IMAGE:stage-src
--target src
- --build-arg BUILDKIT_INLINE_CACHE=1 --pull
-t "$CI_REGISTRY_IMAGE:stage-src"
-t "$CI_REGISTRY_IMAGE:stage-src-branch-$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:stage-src"
- docker push "$CI_REGISTRY_IMAGE:stage-src-branch-$CI_COMMIT_REF_SLUG"
- - docker build --cache-from $CI_REGISTRY_IMAGE:stage-texlive-update
+ - docker build
+ --build-arg BUILDKIT_INLINE_CACHE=1
+ --pull
+ --cache-from $CI_REGISTRY_IMAGE:stage-texlive-update
--target texlive-update
- --build-arg BUILDKIT_INLINE_CACHE=1 --pull
-t "$CI_REGISTRY_IMAGE:stage-texlive-update"
-t "$CI_REGISTRY_IMAGE:stage-texlive-update-branch-$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE:stage-texlive-update"
- docker push "$CI_REGISTRY_IMAGE:stage-texlive-update-branch-$CI_COMMIT_REF_SLUG"
- - docker build --cache-from $CI_REGISTRY_IMAGE
+ - docker build
+ --build-arg BUILDKIT_INLINE_CACHE=1
+ --build-arg login_text=$LOGIN_TEXT
+ --build-arg collab_text=$COLLAB_TEXT
+ --pull
+ --cache-from $CI_REGISTRY_IMAGE
--target app --squash
- --build-arg BUILDKIT_INLINE_CACHE=1 --pull
-t "$CI_REGISTRY_IMAGE"
-t "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE"
--
GitLab