From a3489c9f8c1ebb1988dec487efc09a8e854f47f6 Mon Sep 17 00:00:00 2001 From: William Miceli <1-WilliamMiceli@git.williammiceli.systems> Date: Sat, 4 May 2019 15:22:58 -0400 Subject: [PATCH] It didn't like that... --- .gitlab-ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67b90e4..fee7c3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,11 +24,7 @@ build-base: - docker info - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin 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 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" - mkdir ./images - docker save --output "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" @@ -44,9 +40,5 @@ build-git: script: - docker load --input "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" - docker image ls - - docker build \ - --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" \ - -f Dockerfile.git \ - -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" \ - ./git/ + - docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f Dockerfile.git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" ./git/ #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" \ No newline at end of file