diff options
| author |   Renu Kumari <renu.kumari@bell.ca> | 2021-04-13 14:18:51 -0400 |
|---|---|---|
| committer | Renu Kumari <renu.kumari@bell.ca> | 2021-04-14 00:44:21 -0400 |
| commit | 8e9bead2bb055b5f164eafed40d9f2dc6572c2f0 (patch) | |
| tree | 1a9d2a0a7380d1115763ced46ba259af92f001e3 /aai-common-docker/aai-haproxy-image/src/main/docker | |
| parent | 31c976e338645effcee4bbee5147453b3749830f (diff) | |
Added proxy args in the haproxy Dockerfile
Added DirtiesContext to URIToRelationshipObjectTest for successful test case execution.
Issue-ID: AAI-3318
Signed-off-by: Renu Kumari <renu.kumari@bell.ca>
Change-Id: I53d9b031f93515fdec16fe3f7b0a580c8439b5b3
Diffstat (limited to 'aai-common-docker/aai-haproxy-image/src/main/docker')
| -rw-r--r-- | aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile b/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile index e331e92e..3e04c92c 100644 --- a/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile +++ b/aai-common-docker/aai-haproxy-image/src/main/docker/Dockerfile @@ -1,10 +1,13 @@ FROM haproxy:1.7.10-alpine -# Set up your corporate proxy if there is -ENV HTTP_PROXY "" -ENV HTTPS_PROXY "" -ENV http_proxy "" -ENV https_proxy "" +# For building the image in a proxy environment if necessary +ARG HTTP_PROXY +ARG HTTPS_PROXY + +ENV HTTP_PROXY ${HTTP_PROXY} +ENV HTTPS_PROXY ${HTTPS_PROXY} +ENV http_proxy ${HTTP_PROXY} +ENV https_proxy ${HTTPS_PROXY} RUN apk add --no-cache \ ca-certificates \ @@ -27,5 +30,5 @@ RUN chmod +x /docker-entrypoint.sh USER haproxy ENTRYPOINT [ "/docker-entrypoint.sh" ] -CMD [ "haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/resolvers.conf" ] +CMD [ "haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/resolvers.conf" ] EXPOSE 8443 |