Actually use environment variables as build args

This commit is contained in:
David Mehren 2021-06-14 21:39:28 +02:00
parent 36e87aa982
commit c18da5f72f
No known key found for this signature in database
GPG Key ID: 185982BA4C42B7C3
1 changed files with 15 additions and 6 deletions

View File

@ -16,23 +16,32 @@ before_script:
build-main: build-main:
script: 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 --target src
--build-arg BUILDKIT_INLINE_CACHE=1 --pull
-t "$CI_REGISTRY_IMAGE:stage-src" -t "$CI_REGISTRY_IMAGE:stage-src"
-t "$CI_REGISTRY_IMAGE:stage-src-branch-$CI_COMMIT_REF_SLUG" . -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"
- docker push "$CI_REGISTRY_IMAGE:stage-src-branch-$CI_COMMIT_REF_SLUG" - 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 --target texlive-update
--build-arg BUILDKIT_INLINE_CACHE=1 --pull
-t "$CI_REGISTRY_IMAGE:stage-texlive-update" -t "$CI_REGISTRY_IMAGE:stage-texlive-update"
-t "$CI_REGISTRY_IMAGE:stage-texlive-update-branch-$CI_COMMIT_REF_SLUG" . -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"
- docker push "$CI_REGISTRY_IMAGE:stage-texlive-update-branch-$CI_COMMIT_REF_SLUG" - 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 --target app --squash
--build-arg BUILDKIT_INLINE_CACHE=1 --pull
-t "$CI_REGISTRY_IMAGE" -t "$CI_REGISTRY_IMAGE"
-t "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" . -t "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" .
- docker push "$CI_REGISTRY_IMAGE" - docker push "$CI_REGISTRY_IMAGE"