#2935: nginx.dockerfile, standardize 'nginx.yaml' use

jeff1evesque · May 1, 2018 · 3a51c6d · 3a51c6d
1 parent a23a6cb
commit 3a51c6d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/dockerfile/nginx.dockerfile b/dockerfile/nginx.dockerfile
@@ -14,25 +14,25 @@ ARG LISTEN_PORT
 ARG MEMBERS
 
 ## copy files into container
-COPY hiera.yaml $ROOT_PROJECT/hiera.yaml
-COPY hiera $ROOT_PROJECT/hiera
+COPY hiera.yaml $ROOT_PUPPET/puppet/hiera.yaml
+COPY hiera/reverse-proxy/nginx-$TYPE.yaml $ROOT_PUPPET/puppet/hiera/reverse-proxy/nginx.yaml
 COPY puppet/environment/$ENVIRONMENT/modules/reverse_proxy $ROOT_PUPPET/code/modules/reverse_proxy
 
 ##
 ## provision with puppet: either build a web, or api nginx image.
 ##
 ##     docker build --build-arg TYPE=api --build-arg RUN=false --build-arg VHOST=machine-learning-api.com --build-arg HOST_PORT=9090 --build-arg LISTEN_PORT=6000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-api:0.7 .
-##     docker build --build-arg RUN=false -f dockerfile/nginx.dockerfile -t jeff1evesque/ml-nginx-api:0.7 .
+##     docker build --build-arg TYPE=web --build-arg RUN=false --build-arg VHOST=machine-learning-web.com --build-arg HOST_PORT=9090 --build-arg LISTEN_PORT=6000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 .
 ##
-##     docker build --build-arg TYPE=web --build-arg RUN=false --build-arg VHOST=machine-learning-web.com --build-arg HOST_PORT=8080 --build-arg LISTEN_PORT=5000 -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 .
-##     docker build --build-arg RUN=false -f dockerfile/nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 .
+##     docker build --build-arg TYPE=api --build-arg RUN=false -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 .
+##     docker build --build-arg TYPE=web --build-arg RUN=false -f nginx.dockerfile -t jeff1evesque/ml-nginx-web:0.7 .
 ##
 ##     docker run --hostname nginx-api --name nginx-api -d jeff1evesque/ml-nginx-api:0.7
 ##     docker run --hostname nginx-web --name nginx-web -d jeff1evesque/ml-nginx-web:0.7
 ##
 RUN $PUPPET apply -e "class { reverse_proxy: \
     run => 'false', \
-} " --modulepath=$CONTRIB_MODULES:$MODULES --confdir=$ROOT_PROJECT/hiera.yaml
+} " --modulepath=$CONTRIB_MODULES:$MODULES --confdir=$ROOT_PUPPET/puppet
 
 ## start nginx
 CMD ["nginx", "-g", "daemon off;"]