fixed the front

.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

@@ -1,90 +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
-      - mysql
-    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
-    networks:
-      - mysql
-    env_file:
-      - .env
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: 'numeris'
     volumes:
     - ./var/mysql:/var/lib/mysql
+    container_name: numeris_mysql
 
   back:
-    image: numerisisep/numeris-back
-    container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile.production
-    networks:
-      - caddy
-      - mysql
-    env_file:
-      - .env
-    volumes:
-      - .env:/home/numeris/.env
-    depends_on:
-      - mysql
-    labels:
-      caddy: api.numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
-
-  front:
-    image: numerisisep/numeris-front
-    container_name: numeris_front
-    build:
-      context: ./front
-      dockerfile: Dockerfile.production
-    networks:
-      - caddy
-    labels:
-      caddy: numeris-isep.fr
-      caddy.reverse_proxy: "{{upstreams 80}}"
-
-
-  caddy:
-    image: lucaslorentz/caddy-docker-proxy:ci-alpine
-    restart: unless-stopped
     environment:
-      CADDY_INGRESS_NETWORKS: caddy
+      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:
-      - "80:80"
-      - "443:443"
-    volumes:
-      # docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
-      - /var/run/docker.sock:/var/run/docker.sock
-      - caddy_data:/data
-    networks:
-      - caddy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "localhost:80"]
-
-networks:
-  caddy:
-    external: true
-  mysql:
-
-volumes:
-  caddy_data:
-  mysql:
+      - ${BACK_PORT}:80
+    links:
+    - mysql
+    depends_on:
+    - mysql
+    container_name: numeris_back

docker-compose.testing.yml

@@ -1,31 +1,14 @@
-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
-    volumes:
-      - ./var/mysql_testing:/var/lib/mysql
-
   mysql:
     image: mysql:5.7
-    container_name: numeris_mysql
-    restart: unless-stopped
     environment:
       MYSQL_DATABASE: 'numeris_testing'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+    container_name: numeris_mysql
 
   back:
-    image: numerisisep/numeris-back
-    container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -42,17 +25,4 @@ services:
       - mysql
     depends_on:
       - mysql
-
-  front:
-    image: numerisisep/numeris-front
-    container_name: numeris_front
-    restart: unless-stopped
-    build:
-      context: ./front
-      dockerfile: Dockerfile
-    ports:
-      - 8000:80
-    links:
-      - back
-    depends_on:
-      - back
+    container_name: numeris_back

front/.dockerignore

@@ -1,3 +1,4 @@
 .DS_Store
 node_modules/
 dist/
+Dockerfile

front/Dockerfile

@@ -1,18 +1,10 @@
-FROM node:11.15.0
-
-RUN mkdir -p /home/numeris
-
-ENV PATH /home/numeris/node_modules/.bin:$PATH
-
-COPY package*.json /home/numeris/
-
-# npm install
-WORKDIR /home/numeris
-RUN npm install
+FROM node:11.15.0 as builder
+WORKDIR /opt/numeris
+ENV PATH /opt/numeris/node_modules/.bin:$PATH
+COPY package*.json /opt/numeris/
+RUN npm ci
 RUN npm install -g @angular/cli@7.3.9
-
-COPY . /home/numeris
-
+COPY . .
 RUN npm rebuild node-sass
-
-WORKDIR /home/numeris
+RUN npm run build
+ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80"]

front/Dockerfile.production

@@ -0,0 +1,17 @@
+FROM node:11.15.0 as builder
+WORKDIR /opt/numeris
+ENV PATH /opt/numeris/node_modules/.bin:$PATH
+COPY package.json /opt/numeris/
+COPY yarn.lock /opt/numeris/
+RUN yarn install
+# RUN yarn add -g @angular/cli@7.3.9
+COPY . .
+RUN yarn run build-prod
+ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80" ]
+
+FROM nginx
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+RUN rm -rf /usr/share/nginx/html/*
+COPY --from=builder /opt/numeris/dist /usr/share/nginx/html
+EXPOSE 80
+ENTRYPOINT ["nginx", "-g", "daemon off;"]

front/nginx.conf

@@ -0,0 +1,14 @@
+server {
+    gzip on;
+    gzip_types      text/plain text/css application/javascript;
+    gzip_proxied    no-cache no-store private expired auth;
+    gzip_min_length 1000;
+
+    listen 80;
+    server_name 0.0.0.0;
+    root /usr/share/nginx/html;
+    index index.html;
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}

front/package.json

@@ -60,6 +60,6 @@
     "protractor": "~5.4.2",
     "ts-node": "~8.0.3",
     "tslint": "~5.14.0",
-    "typescript": "^3.2.4"
+    "typescript": "3.1.1"
   }
 }