diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b9eec1..eda34ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,10 @@ build-base: - docker info - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin - mkdir ./images - script: "/ci/build-base.sh" + 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" build-git: stage: Variants diff --git a/ci/build-base.sh b/ci/build-base.sh deleted file mode 100644 index 113ed6c..0000000 --- a/ci/build-base.sh +++ /dev/null @@ -1,3 +0,0 @@ -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