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

Merge pull request #757 from alphagov/docker_build_http_proxy

Browse Source 
Set http proxy params for Docker build
This commit is contained in:
Andras Ferencz-Szabo
2016-12-02 15:16:36 +00:00
committed by GitHub
parent 22f6161440 a67195a86d
commit 2a2488e48c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile-build
View File

@@ -1,13 +1,15 @@
FROM python:3.4-slim FROM python:3.4-slim
ARG APT_HTTP_PROXY ARG HTTP_PROXY
ARG HTTPS_PROXY
ARG NO_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) \ && ([ -z "$HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${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 \

9
docker/Makefile
View File

@@ -7,4 +7,11 @@ 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 --build-arg APT_HTTP_PROXY="${HTTP_PROXY}" . docker build \
--pull \
--build-arg HTTP_PROXY="${HTTP_PROXY}" \
--build-arg HTTPS_PROXY="${HTTP_PROXY}" \
--build-arg NO_PROXY="${NO_PROXY}" \
-f Dockerfile-build \
-t govuk/notify-api-builder \
.