external true

docker-compose.production.yml

@@ -1,42 +1,78 @@
-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
-    container_name: numeris_phpmyadmin
+    networks:
+      - caddy
+      - mysql
+    labels:
+      caddy: phpmyadmin.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
 
   mysql:
     image: mysql:5.7
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: 'numeris'
+    container_name: numeris_mysql
+    restart: unless-stopped
+    networks:
+      - mysql
+    env_file:
+      - .env
     volumes:
     - ./var/mysql:/var/lib/mysql
-    container_name: numeris_mysql
 
   back:
+    container_name: numeris_back
+    restart: unless-stopped
     build:
       context: ./back
       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
+    networks:
+      - caddy
+      - mysql
+    env_file:
+      - .env
     depends_on:
     - mysql
-    container_name: numeris_back
+
+  front:
+    container_name: numeris_front
+    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,14 +1,28 @@
-version: '3'
+version: "3.9"
 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
@@ -25,4 +39,16 @@ services:
       - mysql
     depends_on:
       - mysql
-    container_name: numeris_back
+
+  front:
+    image: numeris-front
+    container_name: numeris_front
+    build:
+      context: ./front
+      dockerfile: Dockerfile
+    ports:
+      - 4200:4200
+    links:
+      - back
+    depends_on:
+      - back

front/.dockerignore

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

front/Dockerfile

@@ -1,10 +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
+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
 RUN npm install -g @angular/cli@7.3.9
-COPY . .
+
+COPY . /home/numeris
+
 RUN npm rebuild node-sass
-RUN npm run build
-ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80"]
+
+WORKDIR /home/numeris

front/Dockerfile.production

@@ -1,17 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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.1.1"
+    "typescript": "^3.2.4"
   }
 }