Merge branch 'master' of https://gitlab.utc.fr/picasoft/projets/dockerfiles

pica-grafana-prom/docker-compose.yml

@@ -13,7 +13,7 @@ volumes:
 
 services:
   grafana:
-    image: image: grafana/grafana:7.1.3
+    image: grafana/grafana:7.1.3
     container_name: grafana
     volumes:
       - grafana:/var/lib/grafana

pica-mumble-web/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     networks:
       - docker_default
     volumes:
-      - ./config.js:/home/node/dist/config.local.js
+      - ./config.json:/home/node/dist/config.local.js
     labels:
       - "traefik.frontend.rule=Host:voice.picasoft.net"
       - "traefik.port=8080"

pica-nextcloud/docker-compose-pica.yml

@@ -2,7 +2,9 @@ version: '3.7'
 
 volumes:
   nextcloud-db:
+    name: docker_nextcloud-db
   nextcloud:
+    name: docker_nextcloud
 
 networks:
   nextcloud:
@@ -11,15 +13,14 @@ networks:
 
 services:
   nextcloud-app:
-    image: nextcloud:17.0.1-fpm-alpine
+    image: nextcloud:19.0.1-fpm-alpine
     container_name: nextcloud-app
     restart: unless-stopped
     volumes:
       - nextcloud:/var/www/html
     environment:
       - MYSQL_HOST=nextcloud-db
-    env_file:
-      - /DATA/docker/secrets/nextcloud-db.secrets
+    env_file: ./secrets/pica.secrets
     depends_on:
       - nextcloud-db
     networks:
@@ -32,7 +33,7 @@ services:
     volumes:
       - nextcloud:/var/www/html:ro
       - ./nginx.conf:/etc/nginx/nginx.conf:ro
-    env_file: ./pica.secrets
+    env_file: ./secrets/pica.secrets
     depends_on:
       - nextcloud-app
     networks:
@@ -49,10 +50,10 @@ services:
     restart: unless-stopped
 
   nextcloud-db:
-    image: mariadb:10.3.17
+    image: mariadb:10.5.5
     container_name: nextcloud-db
     volumes:
       - nextcloud-db:/var/lib/mysql
     networks:
       - nextcloud
-    env_file: ./pica.secrets
+    env_file: ./secrets/pica.secrets