added ENV to Dockerfile, also deployment to circleci

mozilla · Jun 20, 2017 · 4508920 · 4508920
1 parent 53f264e
commit 4508920
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/.circleci/circle.yml b/.circleci/circle.yml
diff --git a/Dockerfile b/Dockerfile
@@ -5,5 +5,7 @@ WORKDIR /app
 RUN mkdir static
 RUN npm install
 
-EXPOSE 1443
+ENV PORT=1443
+EXPOSE $PORT
+
 CMD ["npm", "start"]
diff --git a/circle.yml b/circle.yml
@@ -2,3 +2,10 @@ machine:
   node:
     version: 8.0.0
 
+deployment:
+  latest:
+    branch: master
+    commands:
+    - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+    - docker build . -t mozilla/portal:latest
+    - docker push mozilla/portal:latest
diff --git a/docs/docker.md b/docs/docker.md
@@ -1,5 +1,6 @@
 Environment Variables:
 
+PORT - port the server will listen on (defaults to 1443)
 P2P_S3_BUCKET - the S3 bucket name
 P2P_REDIS_HOST - host name of the redis server
 NODE_ENV - production

diff --git a/server/config.js b/server/config.js
@@ -20,7 +20,7 @@ const conf = convict({
     format: 'port',
     default: 1443,
     arg: 'port',
-    env: 'P2P_LISTEN_PORT'
+    env: 'PORT'
   },
   env: {
     format: ['production', 'development', 'test'],