external true

docker-compose.production.yml

@@ -7,15 +7,21 @@ services:
     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}}"
 
   mysql:
     image: mysql:5.7
     container_name: numeris_mysql
     restart: unless-stopped
+    networks:
+      - mysql
     env_file:
       - .env
     volumes:
@@ -26,7 +32,10 @@ services:
     restart: unless-stopped
     build:
       context: ./back
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.production
+    networks:
+      - caddy
+      - mysql
     env_file:
       - .env
     depends_on:
@@ -37,8 +46,33 @@ services:
     build:
       context: ./front
       dockerfile: Dockerfile
+    networks:
+      - caddy
     depends_on:
       - back
+    labels:
+      caddy: numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 4200}}"
+
+  caddy:
+    image: lucaslorentz/caddy-docker-proxy:ci-alpine
+    restart: unless-stopped
+    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:
   mysql:

docker-compose.testing.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3.9"
 services:
 
   phpmyadmin:
@@ -21,6 +21,7 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
 
   back:
+    image: numeris-back
     container_name: numeris_back
     build:
       context: ./back
@@ -40,12 +41,13 @@ services:
       - mysql
 
   front:
+    image: numeris-front
     container_name: numeris_front
     build:
       context: ./front
       dockerfile: Dockerfile
     ports:
-      - 8000:80
+      - 4200:4200
     links:
       - back
     depends_on:

front/Dockerfile

@@ -1,17 +1,18 @@
-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 . .
-RUN npm rebuild node-sass
-RUN npm run build-prod
-ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
+FROM node:11.15.0
 
-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;"]
+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
+RUN npm install -g @angular/cli@7.3.9
+
+COPY . /home/numeris
+
+RUN npm rebuild node-sass
+
+WORKDIR /home/numeris

front/nginx.conf

@@ -1,19 +0,0 @@
-server {
-  listen 80;
-  sendfile on;
-  default_type application/octet-stream;
-  gzip on;
-  gzip_http_version 1.1;
-  gzip_disable      "MSIE [1-6]\.";
-  gzip_min_length   1100;
-  gzip_vary         on;
-  gzip_proxied      expired no-cache no-store private auth;
-  gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-  gzip_comp_level   9;
-
-  root /usr/share/nginx/html;
-
-  location / {
-    try_files $uri $uri/ /index.html =404;
-  }
-}