From 1ba3471df125961b67bc5a4bae110629ae9d3cce Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 28 Aug 2019 14:42:40 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a34b5d..39d6a58 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"
--
GitLab