darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-02 09:05:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #754 from alphagov/use_http_proxy_for_docker

Browse Source 
Use http proxy for Docker
This commit is contained in:
Andras Ferencz-Szabo
2016-11-30 16:55:13 +00:00
committed by GitHub
parent 40cf6c049f 07aa4cb0b0
commit 2e0ab3eba1
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -121,6 +121,11 @@ build-with-docker: prepare-docker-build-image ## Build inside a Docker container
-e GIT_COMMIT=${GIT_COMMIT} \ -e GIT_COMMIT=${GIT_COMMIT} \
-e BUILD_NUMBER=${BUILD_NUMBER} \ -e BUILD_NUMBER=${BUILD_NUMBER} \
-e BUILD_URL=${BUILD_URL} \ -e BUILD_URL=${BUILD_URL} \
-e http_proxy="${HTTP_PROXY}" \
-e HTTP_PROXY="${HTTP_PROXY}" \
-e https_proxy="${HTTPS_PROXY}" \
-e HTTPS_PROXY="${HTTPS_PROXY}" \
-e NO_PROXY="${NO_PROXY}" \
${DOCKER_BUILDER_IMAGE_NAME} \ ${DOCKER_BUILDER_IMAGE_NAME} \
make build make build
@@ -133,6 +138,11 @@ test-with-docker: prepare-docker-build-image create-docker-test-db ## Run tests
-e GIT_COMMIT=${GIT_COMMIT} \ -e GIT_COMMIT=${GIT_COMMIT} \
-e BUILD_NUMBER=${BUILD_NUMBER} \ -e BUILD_NUMBER=${BUILD_NUMBER} \
-e BUILD_URL=${BUILD_URL} \ -e BUILD_URL=${BUILD_URL} \
-e http_proxy="${HTTP_PROXY}" \
-e HTTP_PROXY="${HTTP_PROXY}" \
-e https_proxy="${HTTPS_PROXY}" \
-e HTTPS_PROXY="${HTTPS_PROXY}" \
-e NO_PROXY="${NO_PROXY}" \
-v `pwd`:/var/project \ -v `pwd`:/var/project \
${DOCKER_BUILDER_IMAGE_NAME} \ ${DOCKER_BUILDER_IMAGE_NAME} \
make test make test
@@ -160,6 +170,11 @@ coverage-with-docker: prepare-docker-build-image ## Generates coverage report in
-e CI_BUILD_URL=${BUILD_URL} \ -e CI_BUILD_URL=${BUILD_URL} \
-e CI_BRANCH=${GIT_BRANCH} \ -e CI_BRANCH=${GIT_BRANCH} \
-e CI_PULL_REQUEST=${CI_PULL_REQUEST} \ -e CI_PULL_REQUEST=${CI_PULL_REQUEST} \
-e http_proxy="${HTTP_PROXY}" \
-e HTTP_PROXY="${HTTP_PROXY}" \
-e https_proxy="${HTTPS_PROXY}" \
-e HTTPS_PROXY="${HTTPS_PROXY}" \
-e NO_PROXY="${NO_PROXY}" \
${DOCKER_BUILDER_IMAGE_NAME} \ ${DOCKER_BUILDER_IMAGE_NAME} \
make coverage make coverage

3
docker/Dockerfile-build
View File

@@ -1,10 +1,13 @@
FROM python:3.4-slim FROM python:3.4-slim
ARG APT_HTTP_PROXY
ENV PYTHONUNBUFFERED=1 \ ENV PYTHONUNBUFFERED=1 \
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
RUN \ RUN \
echo "Install base packages" \ echo "Install base packages" \
&& ([ -z "$APT_HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${APT_HTTP_PROXY}\";\n" > /etc/apt/apt.conf.d/99HttpProxy) \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
make \ make \

2
docker/Makefile
View File

@@ -7,4 +7,4 @@ help:
.PHONY: build-build-image .PHONY: build-build-image
build-build-image: build-build-image:
docker build --pull -f Dockerfile-build -t govuk/notify-api-builder . docker build --pull -f Dockerfile-build -t govuk/notify-api-builder --build-arg APT_HTTP_PROXY="${HTTP_PROXY}" .