Merge pull request #145 from GSA-IAE-APPS/docker-stacks

updates for docker stacks
GSA · Mar 27, 2018 · 29b51f6 · 29b51f6
2 parents bbd868c + ec865f6
commit 29b51f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ RUN npm rebuild node-sass
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
      && ln -sf /dev/stderr /var/log/nginx/error.log
 
-EXPOSE 8080
+EXPOSE 8443
 RUN mkdir /run/nginx
 # Set the default command to execute
 # when creating a new container

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 #!groovy
 //nodeJS Jenkinsfile
 
-def pipeline = fileLoader.fromGit('pipeline', 'https://github.helix.gsa.gov/GSA-IAE/pipeline.git', 'alternative_pipeline', 'ghiaeapps', '')
+def pipeline = fileLoader.fromGit('pipeline', 'https://github.helix.gsa.gov/GSA-IAE/pipeline.git', 'stacks_pipeline', 'ghiaeapps', '')
 pipeline.start()
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -1,5 +1,7 @@
 server {
-  listen 8080 default_server;
+  listen 8443 ssl;
+    ssl_certificate   /run/secrets/app.pem ;
+    ssl_certificate_key /run/secrets/app.key;
 
   gzip on;
   gzip_disable "msie6";