typo

.dockerignore

@@ -4,8 +4,6 @@
 .vscode
 .DS_Store
 docker-compose*.yml
-.env
-.env.template
 
 # Back
 back/.DS_Store
@@ -19,4 +17,4 @@ var
 # Front
 front/.DS_Store
 front/node_modules/
-front/dist/
+front/dist/

docker-compose.production.yml

@@ -5,15 +5,12 @@ services:
     image: phpmyadmin/phpmyadmin:latest
     container_name: numeris_phpmyadmin
     restart: unless-stopped
-    ports:
-      - 3000:80
     links:
       - mysql:db
     depends_on:
       - mysql
     networks:
-      - caddy
-      - mysql
+      caddy:
     labels:
       caddy: phpmyadmin.numeris-isep.fr
       caddy.reverse_proxy: "{{upstreams 80}}"
@@ -22,68 +19,59 @@ services:
     image: mysql:5.7
     container_name: numeris_mysql
     restart: unless-stopped
-    networks:
-      - mysql
     env_file:
       - .env
     volumes:
     - ./var/mysql:/var/lib/mysql
 
   back:
-    image: numerisisep/numeris-back
     container_name: numeris_back
     restart: unless-stopped
     build:
       context: ./back
-      dockerfile: Dockerfile.production
-    networks:
-      - caddy
-      - mysql
+      dockerfile: Dockerfile
     env_file:
       - .env
-    volumes:
-      - .env:/home/numeris/.env
     depends_on:
-      - mysql
+    - mysql
+    networks:
+      caddy:
     labels:
       caddy: api.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
+      caddy.reverse_proxy: "{{upstreams 8080}}"
 
   front:
-    image: numerisisep/numeris-front
     container_name: numeris_front
     build:
       context: ./front
-      dockerfile: Dockerfile.production
+      dockerfile: Dockerfile
+    depends_on:
+      - back
     networks:
-      - caddy
+      caddy:
     labels:
       caddy: numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
+      caddy.reverse_proxy: "{{upstreams 4200}}"
 
   caddy:
-    image: lucaslorentz/caddy-docker-proxy:ci-alpine
+    image: marcpartensky/caddy
     restart: unless-stopped
-    environment:
-      CADDY_INGRESS_NETWORKS: caddy
     ports:
       - "80:80"
       - "443:443"
+    environment:
+      CADDY_INGRESS_NETWORKS: caddy
     volumes:
       # docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
-      - /var/run/docker.sock:/var/run/docker.sock
+      - /run/user/1000/docker.sock:/var/run/docker.sock
       - caddy_data:/data
     networks:
-      - caddy
+      caddy:
     healthcheck:
       test: ["CMD", "curl", "-f", "localhost:80"]
 
 networks:
   caddy:
-    external: true
-  mysql:
 
 volumes:
   caddy_data:

docker-compose.testing.yml

@@ -4,7 +4,6 @@ services:
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
     container_name: numeris_phpmyadmin
-    restart: unless-stopped
     ports:
       - 3000:80
     links:
@@ -17,15 +16,13 @@ services:
   mysql:
     image: mysql:5.7
     container_name: numeris_mysql
-    restart: unless-stopped
     environment:
       MYSQL_DATABASE: 'numeris_testing'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
 
   back:
-    image: numerisisep/numeris-back
+    image: numeris-back
     container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -44,14 +41,13 @@ services:
       - mysql
 
   front:
-    image: numerisisep/numeris-front
+    image: numeris-front
     container_name: numeris_front
-    restart: unless-stopped
     build:
       context: ./front
       dockerfile: Dockerfile
     ports:
-      - 8000:80
+      - 4200:4200
     links:
       - back
     depends_on: