summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2019-08-05 13:24:19 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-05 13:24:19 +0000
commit7bb7fcbe8558e34c6d60eccfde3248c7955be88d (patch)
tree836e44cfe282a053dbcf4ef838402433fcaf9d34
parent0cbb058c9257db8c26e5ed09ceccadabb011dc88 (diff)
parentf8cb32e4a72bb19605a4f72220697af09072d4d4 (diff)
Merge "Rebase image on haproxy-alpine"
-rw-r--r--Dockerfiles/haproxy/Dockerfile17
1 files changed, 5 insertions, 12 deletions
diff --git a/Dockerfiles/haproxy/Dockerfile b/Dockerfiles/haproxy/Dockerfile
index f6d6c283..7bf9b20a 100644
--- a/Dockerfiles/haproxy/Dockerfile
+++ b/Dockerfiles/haproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:1.7
+FROM haproxy:1.7-alpine
# Set up your corporate proxy if there is
ENV HTTP_PROXY ""
@@ -6,17 +6,10 @@ ENV HTTPS_PROXY ""
ENV http_proxy ""
ENV https_proxy ""
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN if [ ! -z ${HTTP_PROXY} ]; \
- then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; \
- fi && \
- if [ ! -z ${HTTP_PROXY} ]; \
- then echo "Acquire::https::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; \
- fi && \
- apt-get update && \
- apt-get -y install ca-certificates openssl curl && \
- rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache \
+ ca-certificates \
+ curl \
+ openssl
RUN mkdir -p /etc/ssl/certs/ && mkdir -p /etc/ssl/private