port 80

.dockerignore

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

back/Dockerfile

@@ -21,7 +21,7 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-WORKDIR /opt/numeris
+WORKDIR /home/numeris
 COPY . .
 
 # Composer install
@@ -31,5 +31,7 @@ RUN composer install --no-interaction
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN usermod -u 1000 www-data
-RUN chown -R www-data:www-data /opt/numeris
+RUN chown -R www-data:www-data /home/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
+
+ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/Dockerfile.production

@@ -19,7 +19,7 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 
-WORKDIR /opt/numeris
+WORKDIR /home/numeris
 COPY . .
 
 ### Back config ###
@@ -29,8 +29,10 @@ RUN composer install --optimize-autoloader --no-dev --no-interaction
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN usermod -u 1000 www-data
-RUN chown -R www-data:www-data /opt/numeris
+RUN chown -R www-data:www-data /home/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
 
 RUN php artisan config:cache
 RUN php artisan route:cache
+
+ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+php artisan key:generate --force
+php artisan jwt:secret --force
+php artisan migrate:refresh --seed --force
+
+docker-php-entrypoint
+apache2-foreground

docker-compose.production.yml

@@ -3,6 +3,7 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
     restart: unless-stopped
     ports:
       - 3000:80
@@ -10,32 +11,80 @@ services:
       - 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:
-    - mysql:/var/lib/mysql
+    - ./var/mysql:/var/lib/mysql
 
   back:
+    container_name: numeris_back
     restart: unless-stopped
     build:
       context: ./back
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.production
+    networks:
+      - caddy
+      - mysql
     env_file:
       - .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
 
   front:
+    container_name: numeris_front
     build:
       context: ./front
       dockerfile: Dockerfile
+    networks:
+      - caddy
     depends_on:
       - back
-    entrypoint: ng s --host 0.0.0.0
+    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
+    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:

docker-compose.testing.yml

@@ -1,25 +1,31 @@
-version: '3'
+version: "3.9"
 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'
 
   back:
+    image: numeris-back
     container_name: numeris_back
+    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -38,12 +44,14 @@ services:
       - mysql
 
   front:
+    image: numeris-front
     container_name: numeris_front
+    restart: unless-stopped
     build:
       context: ./front
       dockerfile: Dockerfile
     ports:
-      - 4200:4200
+      - 8000:80
     links:
       - back
     depends_on:

front/Dockerfile

@@ -1,18 +1,17 @@
-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
+RUN npm run build-prod
+ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0", "--port", "80" ]
 
-WORKDIR /home/numeris
+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,19 @@
+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;
+  }
+}