From 1746a08e10530b36a5dce03328be229556c64765 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 25 May 2019 15:58:45 -0300
Subject: Restart docker-compose after deployment

---
 deploy.sh          |   5 +++++
 docker-compose.yml |  10 +++++-----
 secrets/envrc.sh   | Bin 369 -> 433 bytes
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index c6e3b5c..e07f0a2 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -15,3 +15,8 @@ envsubst < docker-compose.yml > docker-compose.yml.fd
 scp docker-compose.yml.fd "$TLD":/home/vps/docker-compose.yml
 rm docker-compose.yml.fd
 green "Done.\n"
+
+yellow "Restart docker-compose"
+ssh "$TLD" "cd /home/vps/ && docker-compose down"
+ssh "$TLD" "cd /home/vps/ && docker-compose up -d"
+green "Done.\n"
diff --git a/docker-compose.yml b/docker-compose.yml
index 4df7c95..5b3cd14 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,13 +11,13 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - /etc/nginx/vhost.d
       - /usr/share/nginx/html
-      - "${PWD}/volumes/docker/certs:/etc/nginx/certs:ro"
+      - "${VOLUME_HOME}/docker/certs:/etc/nginx/certs:ro"
 
   ssl_companion:
     image: jrcs/letsencrypt-nginx-proxy-companion
     container_name: ssl-companion
     volumes:
-      - "${PWD}/volumes/docker/certs:/etc/nginx/certs:rw"
+      - "${VOLUME_HOME}/docker/certs:/etc/nginx/certs:rw"
       - /var/run/docker.sock:/var/run/docker.sock:ro
     volumes_from:
       - proxy
@@ -28,10 +28,10 @@ services:
     image: wallabag/wallabag
     container_name: wallabag
     volumes:
-      - "${PWD}/volumes/applications/wallabag/data:/var/www/wallabag/data"
-      - "${PWD}/volumes/applications/wallabag/images:/var/www/wallabag/web/assets/images"
+      - "${VOLUME_HOME}/applications/wallabag/data:/var/www/wallabag/data"
+      - "${VOLUME_HOME}/applications/wallabag/images:/var/www/wallabag/web/assets/images"
     ports:
-      - "80:5000"
+      - "5000:80"
     environment:
       - SYMFONY__ENV__FOSUSER_REGISTRATION=false
       - SYMFONY__ENV__FOSUSER_CONFIRMATION=false
diff --git a/secrets/envrc.sh b/secrets/envrc.sh
index 3011d68..b565060 100644
Binary files a/secrets/envrc.sh and b/secrets/envrc.sh differ
-- 
cgit v1.3