diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eda34ce..326bb15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,10 +27,7 @@ build-base: - docker info - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin - mkdir ./images - script: - - docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" . - - docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION" - - docker save --output "./images/$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" + script: /ci/build-base.sh build-git: stage: Variants diff --git a/ci/build-base.sh b/ci/build-base.sh new file mode 100644 index 0000000..113ed6c --- /dev/null +++ b/ci/build-base.sh @@ -0,0 +1,3 @@ +docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" . +docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION" +docker save --output "./images/$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" \ No newline at end of file