diff options
author | Bryan Strassner <bryan.strassner@gmail.com> | 2018-11-16 15:14:32 -0600 |
---|---|---|
committer | Bryan Strassner <bryan.strassner@gmail.com> | 2018-11-16 16:08:28 -0600 |
commit | c4a04b1350d06fff0186e76e1cf69da6ffea3c4e (patch) | |
tree | 0f1beeff5b9c2f46238ab534cb9e209c25f356f7 | |
parent | cc7e00970dd978c392a79537096252e07a3afc1d (diff) |
Remove proxy ARG and ENV from Dockerfile
Removes the proxy settings that were being established as ARG and ENV
commands since these are supported automatically by Docker, and should
not be set as ENV for the built container.
Change-Id: Id23f0b1591ef895df193462174eab2c67e7e0e73
Notes
Notes (review):
Code-Review+2: Scott Hussey <sthussey@att.com>
Workflow+1: Scott Hussey <sthussey@att.com>
Verified+2: Zuul
Submitted-by: Zuul
Submitted-at: Fri, 16 Nov 2018 23:31:59 +0000
Reviewed-on: https://review.openstack.org/618599
Project: openstack/airship-deckhand
Branch: refs/heads/master
-rw-r--r-- | images/deckhand/Dockerfile | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/images/deckhand/Dockerfile b/images/deckhand/Dockerfile index dcb5ec4..dbcbfa3 100644 --- a/images/deckhand/Dockerfile +++ b/images/deckhand/Dockerfile | |||
@@ -25,18 +25,6 @@ ENV DEBIAN_FRONTEND noninteractive | |||
25 | ENV container docker | 25 | ENV container docker |
26 | ENV PORT 9000 | 26 | ENV PORT 9000 |
27 | 27 | ||
28 | ARG HTTP_PROXY="" | ||
29 | ENV HTTP_PROXY ${HTTP_PROXY} | ||
30 | ENV http_proxy ${HTTP_PROXY} | ||
31 | |||
32 | ARG HTTPS_PROXY="" | ||
33 | ENV HTTPS_PROXY ${HTTPS_PROXY} | ||
34 | ENV https_proxy ${HTTPS_PROXY} | ||
35 | |||
36 | ARG NO_PROXY="127.0.0.1,localhost,.svc.cluster.local" | ||
37 | ENV NO_PROXY ${NO_PROXY} | ||
38 | ENV no_proxy ${NO_PROXY} | ||
39 | |||
40 | # Expose port 9000 for application | 28 | # Expose port 9000 for application |
41 | EXPOSE $PORT | 29 | EXPOSE $PORT |
42 | 30 | ||