typo

docker-compose.production.yml

@@ -3,23 +3,29 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
     restart: unless-stopped
-    ports:
-      - 3000:80
     links:
       - mysql:db
     depends_on:
       - mysql
+    networks:
+      caddy:
+    labels:
+      caddy: phpmyadmin.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
 
   mysql:
     image: mysql:5.7
+    container_name: numeris_mysql
     restart: unless-stopped
     env_file:
       - .env
     volumes:
-    - mysql:/var/lib/mysql
+    - ./var/mysql:/var/lib/mysql
 
   back:
+    container_name: numeris_back
     restart: unless-stopped
     build:
       context: ./back
@@ -28,14 +34,45 @@ services:
       - .env
     depends_on:
     - mysql
+    networks:
+      caddy:
+    labels:
+      caddy: api.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 8080}}"
 
   front:
+    container_name: numeris_front
     build:
       context: ./front
       dockerfile: Dockerfile
     depends_on:
       - back
-    entrypoint: ng s --host 0.0.0.0
+    networks:
+      caddy:
+    labels:
+      caddy: numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 4200}}"
+
+  caddy:
+    image: marcpartensky/caddy
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+    environment:
+      CADDY_INGRESS_NETWORKS: caddy
+    volumes:
+      # docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
+      - /run/user/1000/docker.sock:/var/run/docker.sock
+      - caddy_data:/data
+    networks:
+      caddy:
+    healthcheck:
+      test: ["CMD", "curl", "-f", "localhost:80"]
+
+networks:
+  caddy:
 
 volumes:
+  caddy_data:
   mysql:

docker-compose.testing.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3.9"
 services:
 
   phpmyadmin:
@@ -10,6 +10,8 @@ services:
       - mysql:db
     depends_on:
       - mysql
+    volumes:
+      - ./var/mysql_testing:/var/lib/mysql
 
   mysql:
     image: mysql:5.7
@@ -19,6 +21,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
 
   back:
+    image: numeris-back
     container_name: numeris_back
     build:
       context: ./back
@@ -38,6 +41,7 @@ services:
       - mysql
 
   front:
+    image: numeris-front
     container_name: numeris_front
     build:
       context: ./front