better dockerfile

docker-compose.production.yml

@@ -1,78 +1,42 @@
-version: "3.9"
+version: '3'
 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}}"
+    container_name: numeris_phpmyadmin
 
   mysql:
     image: mysql:5.7
-    container_name: numeris_mysql
-    restart: unless-stopped
-    env_file:
-      - .env
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: 'numeris'
     volumes:
     - ./var/mysql:/var/lib/mysql
+    container_name: numeris_mysql
 
   back:
-    container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
-      dockerfile: Dockerfile
-    env_file:
-      - .env
+      dockerfile: Dockerfile.production
+    environment:
+      APP_ENV: production
+      APP_DEBUG: 'false'
+      DB_CONNECTION: mysql
+      DB_HOST: ${DB_HOST}
+      DB_PORT: ${DB_PORT}
+      DB_DATABASE: ${DB_DATABASE}
+      DB_USERNAME: ${DB_USERNAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+    ports:
+      - ${BACK_PORT}:80
+    links:
+    - mysql
     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
-    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:
+    container_name: numeris_back

docker-compose.testing.yml

@@ -1,28 +1,14 @@
-version: "3.9"
+version: '3'
 services:
 
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    container_name: numeris_phpmyadmin
-    ports:
-      - 3000:80
-    links:
-      - mysql:db
-    depends_on:
-      - mysql
-    volumes:
-      - ./var/mysql_testing:/var/lib/mysql
-
   mysql:
     image: mysql:5.7
-    container_name: numeris_mysql
     environment:
       MYSQL_DATABASE: 'numeris_testing'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+    container_name: numeris_mysql
 
   back:
-    image: numeris-back
-    container_name: numeris_back
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -39,16 +25,4 @@ services:
       - mysql
     depends_on:
       - mysql
-
-  front:
-    image: numeris-front
-    container_name: numeris_front
-    build:
-      context: ./front
-      dockerfile: Dockerfile
-    ports:
-      - 4200:4200
-    links:
-      - back
-    depends_on:
-      - back
+    container_name: numeris_back

front/Dockerfile

@@ -1,18 +1,14 @@
 FROM node:11.15.0
 
-RUN mkdir -p /home/numeris
-
+WORKDIR /home/numeris
 ENV PATH /home/numeris/node_modules/.bin:$PATH
 
 COPY package*.json /home/numeris/
 
 # npm install
-WORKDIR /home/numeris
 RUN npm install
 RUN npm install -g @angular/cli@7.3.9
 
 COPY . /home/numeris
 
 RUN npm rebuild node-sass
-
-WORKDIR /home/numeris