Merge pull request #106 from project-lovelace/ali/acme-volume

project-lovelace · Mar 28, 2021 · 7ba5b65 · 7ba5b65
2 parents 06cc7bc + 6be64d5
commit 7ba5b65
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   nginx-proxy-letsencrypt:
@@ -10,6 +10,7 @@ services:
       - certs:/etc/nginx/certs
       - html:/usr/share/nginx/html
       - vhost:/etc/nginx/vhost.d
+      - acme:/etc/acme.sh
     depends_on:
       - nginx-proxy
 
@@ -68,3 +69,4 @@ volumes:
   certs:
   html:
   vhost:
+  acme:
diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   nginx-proxy-letsencrypt:
@@ -10,6 +10,7 @@ services:
       - certs:/etc/nginx/certs
       - html:/usr/share/nginx/html
       - vhost:/etc/nginx/vhost.d
+      - acme:/etc/acme.sh
     depends_on:
       - nginx-proxy
 
@@ -68,3 +69,4 @@ volumes:
   certs:
   html:
   vhost:
+  acme:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   django:

diff --git a/update_production.bash b/update_production.bash
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-git pull
-docker pull projectlovelace/lovelace-engine
-docker-compose -f docker-compose.prod.yml build
-docker-compose -f docker-compose.prod.yml down
-docker-compose -f docker-compose.prod.yml up --detach
+git pull && \
+docker pull projectlovelace/lovelace-engine && \
+docker-compose -f docker-compose.prod.yml build && \
+docker-compose -f docker-compose.prod.yml down && \
+docker-compose -f docker-compose.prod.yml up --detach && \
 docker-compose -f docker-compose.prod.yml exec django python manage.py collectstatic --no-input