wait #7450 @6

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 893cb6821c328adf4df94898b2bc9bdc32a24aa6..4336637abc823da01510e06123e30d4cc414fc67 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
   php-fpm:
     container_name: fluidbook-toolbox
@@ -110,7 +109,7 @@ services:
       # Config
       - '/home/toolbox/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
       # External volume
-      - 'usstorage:/application/usstorage:ro'
+      - 'usstorage1:/application/usstorage:ro'
     ports:
       - '37126:80'
     environment:
@@ -182,22 +181,23 @@ services:
 
 networks:
   fluidbook-toolbox:
-    external:
-      name: fluidbook-toolbox
+    name: fluidbook-toolbox
+    external: true
   fluidbook-processfarm:
-    external:
-      name: fluidbook-processfarm
+    name: fluidbook-processfarm
+    external: true
   nginxproxy:
-    external:
-      name: nginxproxy
+    name: nginxproxy
+    external: true
   extranet:
-    external:
-      name: extranet
+    name: extranet
+    external: true
 
 volumes:
-  usstorage:
+  usstorage1:
     driver: ucphhpc/sshfs:latest
     driver_opts:
       sshcmd: "fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data"
       allow_other: ""
       password: "Qu2E9uq48bBzsqGiZA"
+      reconnect: ""

diff --git a/.docker/update.sh b/.docker/update.sh
index bf9f32b7a5dbaa5a3c83061361e6cd966e3e24db..ca5bd34f95dfde617c9fcaba9e4499168651c8af 100644 (file)
--- a/.docker/update.sh
+++ b/.docker/update.sh
@@ -8,7 +8,13 @@ docker plugin install ucphhpc/sshfs --grant-all-permissions
 chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/www/.docker/config/cron/host /etc/cron.d/toolbox
 chown root:root /home/toolbox/www/.docker/config/sudoers
 docker network create fluidbook-toolbox
+docker network create extranet
+docker network create nginxproxy
+docker network create fluidbook-processfarm
 docker compose down -v
+docker container prune -f
+docker volume prune -f
+docker volume rm fluidbook-toolbox_usstorage1 -f
 docker compose up -d
 ufw-docker allow fluidbook-toolbox
 docker exec -it fluidbook-toolbox /application/scripts/update.sh