udpates to Dockerfiles to include proxy settings for pulling in host …

…machine proxy settings
sandialabs · Jan 24, 2018 · 813b87f · 813b87f
1 parent 3e87651
commit 813b87f
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 10 deletions.
diff --git a/Dockerfile-Activemq b/Dockerfile-Activemq
@@ -1,8 +1,20 @@
 
 #ActiveMQ dockerfile
 FROM openjdk:8 
-ARG proxy
-ENV proxy=${proxy} 
+
+ARG HTTPS_PROXY
+ARG HTTP_PROXY
+ARG https_proxy
+ARG http_proxy
+ARG no_proxy
+
+ENV https_proxy=${https_proxy}
+ENV http_proxy=${http_proxy}
+ENV HTTP_PROXY=${HTTP_PROXY}
+ENV HTTPS_PROXY=${HTTPS_PROXY}
+ENV no_proxy=${no_proxy}
+ENV NO_PROXY=${NO_PROXY}
+
 
 #AMQ
 ENV ACTIVEMQ_VERSION 5.14.3
@@ -16,7 +28,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 #install amq
 
 RUN set -x && \
-    curl -k -s -S https://archive.apache.org/dist/activemq/$ACTIVEMQ_VERSION/$ACTIVEMQ-bin.tar.gz | tar xvz -C /opt && \
+    #wget -qO- https://archive.apache.org/dist/activemq/$ACTIVEMQ_VERSION/$ACTIVEMQ-bin.tar.gz | tar xvz -C /opt && \
+    curl -k -s -S  https://archive.apache.org/dist/activemq/$ACTIVEMQ_VERSION/$ACTIVEMQ-bin.tar.gz | tar xvz -C /opt && \
     ln -s /opt/$ACTIVEMQ $ACTIVEMQ_HOME && \
     useradd -r -M -d $ACTIVEMQ_HOME activemq && \
     chown -R activemq:activemq /opt/$ACTIVEMQ && \

diff --git a/Dockerfile-Apache b/Dockerfile-Apache
@@ -1,5 +1,21 @@
 FROM ubuntu:16.04
 
+
+ARG HTTPS_PROXY
+ARG HTTP_PROXY
+ARG https_proxy
+ARG http_proxy
+ARG no_proxy
+
+ENV https_proxy=${https_proxy}
+ENV http_proxy=${http_proxy}
+ENV HTTP_PROXY=${HTTP_PROXY}
+ENV HTTPS_PROXY=${HTTPS_PROXY}
+ENV no_proxy=${no_proxy}
+ENV NO_PROXY=${NO_PROXY}
+
+
+
 RUN apt-get update && \
   apt-get install -y apache2 libldap2-dev libsasl2-dev libssl-dev apache2 libapache2-mod-wsgi \
   apache2 libapache2-mod-authnz-external libapache2-mod-rpaf && \

diff --git a/Dockerfile-Elastic b/Dockerfile-Elastic
@@ -1,5 +1,19 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.3
 
+ARG HTTPS_PROXY
+ARG HTTP_PROXY
+ARG https_proxy
+ARG http_proxy
+ARG no_proxy
+
+ENV https_proxy=${https_proxy}
+ENV http_proxy=${http_proxy}
+ENV HTTP_PROXY=${HTTP_PROXY}
+ENV HTTPS_PROXY=${HTTPS_PROXY}
+ENV no_proxy=${no_proxy}
+ENV NO_PROXY=${NO_PROXY}
+
+
 ARG ELASTICGID
 ARG ELASTICUID
 ENV ELASTICUID=${ELASTICUID}

diff --git a/Dockerfile-Perl b/Dockerfile-Perl
@@ -1,5 +1,21 @@
 FROM ubuntu:16.04
 
+
+
+ARG HTTPS_PROXY
+ARG HTTP_PROXY
+ARG https_proxy
+ARG http_proxy
+ARG no_proxy
+
+ENV https_proxy=${https_proxy}
+ENV http_proxy=${http_proxy}
+ENV HTTP_PROXY=${HTTP_PROXY}
+ENV HTTPS_PROXY=${HTTPS_PROXY}
+ENV no_proxy=${no_proxy}
+ENV NO_PROXY=${NO_PROXY}
+
+
 ENV no_proxy="elastic,mongodb,scot,activemq,apache"
 ENV NO_PROXY="elastic,mongodb,scot,activemq,apache"
 

diff --git a/Dockerfile-Scot b/Dockerfile-Scot
@@ -6,10 +6,6 @@ ENV SCOTUID=${SCOTUID}
 ENV SCOTGID=${SCOTGID}
 
 ENV DEBIAN_FRONTEND="noninteractive" \
-    http_proxy=" " \
-    https_proxy=" " \
-    HTTP_PROXY=" " \
-    HTTPS_PROXY=" " \
     NO_PROXY="elastic,mongodb,activemq"
 
 RUN apt-get update && \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,6 +4,11 @@ services:
     build:
       dockerfile: Dockerfile-Apache
       context: ./
+      args:
+        http_proxy: ${http_proxy}
+        https_proxy: ${https_proxy}
+        HTTP_PROXY: ${HTTP_PROXY}
+        HTTPS_PROXY: ${HTTPS_PROXY}
     volumes: 
      - "/etc/timezone:/etc/timezone:ro"
      - "/etc/localtime:/etc/localtime:ro"
@@ -20,9 +25,12 @@ services:
      - "/var/log/activemq:/var/log/activemq/log/"
     build:
       dockerfile: Dockerfile-Activemq
-      context: ./
+      context: ./ 
       args:
-       proxy: " " 
+        http_proxy: ${http_proxy}
+        https_proxy: ${https_proxy}
+        HTTP_PROXY: ${HTTP_PROXY}
+        HTTPS_PROXY: ${HTTPS_PROXY}
     networks:
      - scot-docker-net
     container_name: activemq
@@ -34,6 +42,10 @@ services:
       args:
         MONGODBUID: ${MONGODBUID}
         MONGODBGID: ${MONGODBGID}
+        http_proxy: ${http_proxy}
+        https_proxy: ${https_proxy}
+        HTTP_PROXY: ${HTTP_PROXY}
+        HTTPS_PROXY: ${HTTPS_PROXY}
     volumes:
      - "/etc/timezone:/etc/timezone:ro"
      - "/etc/localtime:/etc/localtime:ro"
@@ -51,7 +63,11 @@ services:
      context: ./
      args: 
        ELASTICUID: ${ELASTICUID}
-       ELASTICGID: ${ELASTICGID}
+       ELASTICGID: ${ELASTICGID}i
+       http_proxy: ${http_proxy}
+       https_proxy: ${https_proxy}
+       HTTP_PROXY: ${HTTP_PROXY}
+       HTTPS_PROXY: ${HTTPS_PROXY}
    volumes:
      - "/etc/timezone:/etc/timezone:ro"
      - "/etc/localtime:/etc/localtime:ro"
@@ -92,6 +108,11 @@ services:
     build: 
       dockerfile: Dockerfile-Perl
       context: ./
+      args:
+        http_proxy: ${http_proxy}
+        https_proxy: ${https_proxy}
+        HTTP_PROXY: ${HTTP_PROXY}
+        HTTPS_PROXY: ${HTTPS_PROXY}
     image: scot_perl
 
   flair: