From 6fa496588c3c1ad1df27d65bee388045bf1e2983 Mon Sep 17 00:00:00 2001
From: Laszlo Valko <valko@linux.karinthy.hu>
Date: Tue, 29 Jan 2019 04:43:56 +0100
Subject: [PATCH] Changed the way http proxy configuration is injected.

---
 Dockerfile         | 11 ++++++++---
 docker-compose.yml |  6 ++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 85a1837..8eb0dda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,14 @@
 FROM alpine
 
-ARG http_proxy
-ARG https_proxy
+ARG HTTP_PROXY_HOST
+ARG HTTP_PROXY_PORT
+ARG HTTPS_PROXY_HOST
+ARG HTTPS_PROXY_PORT
 
-RUN apk add --no-cache openldap openldap-clients openldap-back-ldap openldap-overlay-deref ldapvi && mkdir -p /run/openldap
+RUN \
+    if [ -n "$HTTP_PROXY_HOST" -a -n "$HTTP_PROXY_PORT" ]; then export http_proxy=http://$HTTP_PROXY_HOST:$HTTP_PROXY_PORT; fi && \
+    if [ -n "$HTTPS_PROXY_HOST" -a -n "$HTTPS_PROXY_PORT" ]; then export https_proxy=http://$HTTPS_PROXY_HOST:$HTTPS_PROXY_PORT; fi && \
+    apk add --no-cache openldap openldap-clients openldap-back-ldap openldap-overlay-deref ldapvi && mkdir -p /run/openldap
 
 COPY root /
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 27f00b1..85cb6d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,8 +5,10 @@ services:
     build:
       context: .
       args:
-        http_proxy: ${http_proxy}
-        https_proxy: ${https_proxy}
+        HTTP_PROXY_HOST: ${HTTP_PROXY_HOST}
+        HTTP_PROXY_PORT: ${HTTP_PROXY_PORT}
+        HTTPS_PROXY_HOST: ${HTTPS_PROXY_HOST}
+        HTTPS_PROXY_PORT: ${HTTPS_PROXY_PORT}
     container_name: ldap.proxy
     networks:
       - ldap.proxy