Unverified Commit 11683c1e authored by David Mehren's avatar David Mehren
Browse files

Use new build logic for branches too

parent b53faee1
Loading
Loading
Loading
Loading
+28 −2
Original line number Diff line number Diff line
@@ -52,7 +52,33 @@ 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}"
      --cache-from $CI_REGISTRY_IMAGE:stage-src
      --target src
      -t "$CI_REGISTRY_IMAGE:stage-src"
      -t "$CI_REGISTRY_IMAGE:stage-src-branch-$CI_COMMIT_REF_SLUG" .
    - docker push "$CI_REGISTRY_IMAGE:stage-src-branch-$CI_COMMIT_REF_SLUG"
    - docker build
      --build-arg BUILDKIT_INLINE_CACHE=1
      --build-arg LDAP_PLUGIN_URL="${LDAP_PLUGIN_URL}"
      --pull
      --cache-from $CI_REGISTRY_IMAGE:stage-texlive-update
      --target texlive-update
      -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-branch-$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
      --target app --squash
      -t "$CI_REGISTRY_IMAGE"
      -t "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" .
    - docker push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
  except:
    - main