diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a34b5d241ec6c5359c761dbe4a6e1173ad36ef1..39d6a5894a922243a3e4df772c03e82cb9cfa3bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,19 +73,19 @@ build: # shellcheck disable=SC2086 # double quoting for globbing warning for $AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS - docker pull $CI_APPLICATION_REPOSITORY:latest - | - docker build \ - --cache-from $CI_REGISTRY_IMAGE:latest \ - --build-arg BUILDPACK_URL="$BUILDPACK_URL" \ - --build-arg HTTP_PROXY="$HTTP_PROXY" \ - --build-arg http_proxy="$http_proxy" \ - --build-arg HTTPS_PROXY="$HTTPS_PROXY" \ - --build-arg https_proxy="$https_proxy" \ - --build-arg FTP_PROXY="$FTP_PROXY" \ - --build-arg ftp_proxy="$ftp_proxy" \ - --build-arg NO_PROXY="$NO_PROXY" \ - --build-arg no_proxy="$no_proxy" \ + docker build + --cache-from $CI_REGISTRY_IMAGE:latest + --build-arg BUILDPACK_URL="$BUILDPACK_URL" + --build-arg HTTP_PROXY="$HTTP_PROXY" + --build-arg http_proxy="$http_proxy" + --build-arg HTTPS_PROXY="$HTTPS_PROXY" + --build-arg https_proxy="$https_proxy" + --build-arg FTP_PROXY="$FTP_PROXY" + --build-arg ftp_proxy="$ftp_proxy" + --build-arg NO_PROXY="$NO_PROXY" + --build-arg no_proxy="$no_proxy" $AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS \ - --tag "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" \ + --tag "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" --tag "$CI_APPLICATION_REPOSITORY:latest". - docker push "$CI_APPLICATION_REPOSITORY:latest" - docker push "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"