Merge branch 'master' into sprint#10/issue-fixes-#2

demokratie-live · Apr 23, 2018 · d00d9ab · d00d9ab
2 parents 80c7ea6 + 522ac9c
commit d00d9ab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ matrix:
     os: linux
     before_install:
     - openssl aes-256-cbc -k "$SECRET" -in server/.env.enc -out server/.env -d
+    - openssl aes-256-cbc -k "$SECRET" -in bundestag.io/.env.enc -out bundestag.io/.env -d
     script:
     - docker-compose build
   # client in master?
@@ -69,6 +70,7 @@ matrix:
     os: linux
     before_install:
     - openssl aes-256-cbc -k "$SECRET" -in server/.env.enc -out server/.env -d
+    - openssl aes-256-cbc -k "$SECRET" -in bundestag.io/.env.enc -out bundestag.io/.env -d
     - openssl aes-256-cbc -k "$SECRET" -in ssh_key.enc -out ssh_key -d
     - openssl aes-256-cbc -k "$SECRET" -in ssh_key.pub.enc -out ssh_key.pub -d
     script:
@@ -84,6 +86,7 @@ matrix:
     os: linux
     before_install:
     - openssl aes-256-cbc -k "$SECRET" -in server/.env.enc -out server/.env -d
+    - openssl aes-256-cbc -k "$SECRET" -in bundestag.io/.env.enc -out bundestag.io/.env -d
     - openssl aes-256-cbc -k "$SECRET" -in ssh_key.enc -out ssh_key -d
     - openssl aes-256-cbc -k "$SECRET" -in ssh_key.pub.enc -out ssh_key.pub -d
     script:

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -13,6 +13,7 @@ services:
     environment:
       NGINX_DOCKER_GEN_CONTAINER: ${DOCKER_GEN:-nginx-gen}
       NGINX_PROXY_CONTAINER: ${NGINX_WEB:-nginx-web}
+      NODE_ENV: ${NODE_ENV:-production}
     logging:
       options:
         max-size: ${NGINX_LETSENCRYPT_LOG_MAX_SIZE:-2m}

diff --git a/start-production.sh b/start-production.sh
@@ -13,5 +13,6 @@ git status
 echo "### Start docker Process ###"
 echo "# docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build"
 docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d --build
-echo "# docker system prune"
-docker system prune
+echo "### Cleanup ###"
+echo "# y | docker system prune"
+echo y | docker system prune