#3287: ensure proper docker 'ENV' assignment

jeff1evesque · Oct 4, 2018 · 2c10f79 · 2c10f79
1 parent 7710436
commit 2c10f79
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/dockerfile/base.dockerfile b/dockerfile/base.dockerfile
@@ -1,14 +1,14 @@
 FROM ubuntu:16.04
 
 ## environment variables
-ENV ENVIRONMENT docker\
-    PUPPET /opt/puppetlabs/bin/puppet\
-    ROOT_PROJECT /var/machine-learning\
-    ROOT_PUPPET /etc/puppetlabs\
-    MODULES $ROOT_PUPPET/code/modules\
-    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib\
-    ENVPATH $ROOT_PUPPET/code/environment/$ENVIRONMENT\
-    PUPPET_VERSION puppet5-release-xenial.deb
+ENV ENVIRONMENT=docker\
+    PUPPET=/opt/puppetlabs/bin/puppet\
+    ROOT_PROJECT=/var/machine-learning\
+    ROOT_PUPPET=/etc/puppetlabs\
+    MODULES=$ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES=$ROOT_PUPPET/code/modules_contrib\
+    ENVPATH=$ROOT_PUPPET/code/environment/$ENVIRONMENT\
+    PUPPET_VERSION=puppet5-release-xenial.deb
 
 ## ensure directory
 RUN mkdir -p $ROOT_PROJECT/log $ROOT_PUPPET/code/environment/$ENVIRONMENT $ROOT_PUPPET/puppet/hiera $ROOT_PUPPET/code/modules_contrib

diff --git a/dockerfile/mongodb.dockerfile b/dockerfile/mongodb.dockerfile
@@ -1,11 +1,11 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker\
-    PUPPET /opt/puppetlabs/bin/puppet\
-    ROOT_PUPPET /etc/puppetlabs\
-    MODULES $ROOT_PUPPET/code/modules\
-    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT=docker\
+    PUPPET=/opt/puppetlabs/bin/puppet\
+    ROOT_PUPPET=/etc/puppetlabs\
+    MODULES=$ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES=$ROOT_PUPPET/code/modules_contrib
 
 ## copy files into container
 COPY hiera $ROOT_PUPPET/puppet/hiera

diff --git a/dockerfile/nginx.dockerfile b/dockerfile/nginx.dockerfile
@@ -1,12 +1,12 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker\
-    ROOT_PROJECT /var/machine-learning\
-    PUPPET /opt/puppetlabs/bin/puppet\
-    ROOT_PUPPET /etc/puppetlabs\
-    MODULES $ROOT_PUPPET/code/modules\
-    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT=docker\
+    ROOT_PROJECT=/var/machine-learning\
+    PUPPET=/opt/puppetlabs/bin/puppet\
+    ROOT_PUPPET=/etc/puppetlabs\
+    MODULES=$ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES=$ROOT_PUPPET/code/modules_contrib
 
 ARG TYPE
 ARG VHOST

diff --git a/dockerfile/redis.dockerfile b/dockerfile/redis.dockerfile
@@ -1,11 +1,11 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker\
-    PUPPET /opt/puppetlabs/bin/puppet\
-    ROOT_PUPPET /etc/puppetlabs\
-    MODULES $ROOT_PUPPET/code/modules\
-    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT=docker\
+    PUPPET=/opt/puppetlabs/bin/puppet\
+    ROOT_PUPPET=/etc/puppetlabs\
+    MODULES=$ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES=$ROOT_PUPPET/code/modules_contrib
 
 ## copy files into container
 COPY hiera $ROOT_PUPPET/puppet/hiera

diff --git a/dockerfile/sklearn.dockerfile b/dockerfile/sklearn.dockerfile
@@ -1,12 +1,12 @@
 FROM jeff1evesque/ml-base:0.8
 
 ## local variables
-ENV ENVIRONMENT docker\
-    PUPPET /opt/puppetlabs/bin/puppet\
-    ROOT_PROJECT /var/machine-learning\
-    ROOT_PUPPET /etc/puppetlabs\
-    MODULES $ROOT_PUPPET/code/modules\
-    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT=docker\
+    PUPPET=/opt/puppetlabs/bin/puppet\
+    ROOT_PROJECT=/var/machine-learning\
+    ROOT_PUPPET=/etc/puppetlabs\
+    MODULES=$ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES=$ROOT_PUPPET/code/modules_contrib
 
 ## copy files into container
 COPY hiera $ROOT_PROJECT/hiera

diff --git a/dockerfile/webserver.dockerfile b/dockerfile/webserver.dockerfile
@@ -1,12 +1,12 @@
 FROM jeff1evesque/ml-sklearn:0.8
 
 ## local variables
-ENV ENVIRONMENT docker\
-    PUPPET /opt/puppetlabs/bin/puppet\
-    ROOT_PROJECT /var/machine-learning\
-    ROOT_PUPPET /etc/puppetlabs\
-    MODULES $ROOT_PUPPET/code/modules\
-    CONTRIB_MODULES $ROOT_PUPPET/code/modules_contrib
+ENV ENVIRONMENT=docker\
+    PUPPET=/opt/puppetlabs/bin/puppet\
+    ROOT_PROJECT=/var/machine-learning\
+    ROOT_PUPPET=/etc/puppetlabs\
+    MODULES=$ROOT_PUPPET/code/modules\
+    CONTRIB_MODULES=$ROOT_PUPPET/code/modules_contrib
 
 ## ensure directory
 RUN mkdir -p $ROOT_PROJECT/interface $ROOT_PROJECT/hiera $ROOT_PUPPET/brain $ROOT_PUPPET/test