Merge branch '50243-auto-devops-behind-a-proxy' into 'master'
Resolve "Auto DevOps: Pass proxy variables to build environments" Closes #50243 See merge request gitlab-org/gitlab-ce!21159
This commit is contained in:
commit
73bf657fde
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
title: Vendor Auto-DevOps.gitlab-ci.yml with new proxy env vars passed through to
|
||||
docker
|
||||
merge_request: 21159
|
||||
author: kinolaev
|
||||
type: added
|
|
@ -720,10 +720,29 @@ rollout 100%:
|
|||
|
||||
if [[ -f Dockerfile ]]; then
|
||||
echo "Building Dockerfile-based application..."
|
||||
docker build -t "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" .
|
||||
docker build \
|
||||
--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" \
|
||||
-t "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG" .
|
||||
else
|
||||
echo "Building Heroku-based application using gliderlabs/herokuish docker image..."
|
||||
docker run -i -e BUILDPACK_URL --name="$CI_CONTAINER_NAME" -v "$(pwd):/tmp/app:ro" gliderlabs/herokuish /bin/herokuish buildpack build
|
||||
docker run -i \
|
||||
-e BUILDPACK_URL \
|
||||
-e HTTP_PROXY \
|
||||
-e http_proxy \
|
||||
-e HTTPS_PROXY \
|
||||
-e https_proxy \
|
||||
-e FTP_PROXY \
|
||||
-e ftp_proxy \
|
||||
-e NO_PROXY \
|
||||
-e no_proxy \
|
||||
--name="$CI_CONTAINER_NAME" -v "$(pwd):/tmp/app:ro" gliderlabs/herokuish /bin/herokuish buildpack build
|
||||
docker commit "$CI_CONTAINER_NAME" "$CI_APPLICATION_REPOSITORY:$CI_APPLICATION_TAG"
|
||||
docker rm "$CI_CONTAINER_NAME" >/dev/null
|
||||
echo ""
|
||||
|
|
Loading…
Reference in New Issue