Merge branch 'master' into staging

Finally staging env

.dockerignore

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

.github/workflows/docker-build-test.yml

@@ -1,31 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches:
-      - "*"
-      - "!master"
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-  # Run tests for any PRs.
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Fake env file
-      run: touch .env
-
-    - name: Build
-      run: docker-compose -f docker-compose.production.yml build back

.github/workflows/docker.yml

@@ -1,38 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches:
-      - "master"
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-
-  # Run tests for any PRs.
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Build and push Docker images
-      uses: docker/build-push-action@v3
-      with:
-        context: back
-        dockerfile: Dockerfile.production
-        push: true
-        tags: marcpartensky/numeris-back:latest

.github/workflows/prod.yml

@@ -0,0 +1,91 @@
+name: Deploy production
+
+on:
+  push:
+    branches:
+      - "master"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+jobs:
+  build-front:
+    name: Build front
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push front
+      uses: docker/build-push-action@v3
+      with:
+        context: front
+        file: front/Dockerfile.production
+        push: true
+        tags: numerisisep/numeris-front:prod
+        cache-from: type=gha
+        cache-to: type=gha
+
+  build-back:
+    name: Build back
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push back
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        file: back/Dockerfile.production
+        push: true
+        tags: numerisisep/numeris-back:prod
+        cache-from: type=gha
+        cache-to: type=gha
+
+
+  pull-and-recreate:
+    name: Pull and recreate
+    needs:
+      - build-front
+      - build-back
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote ssh commands using password
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+          # password: ${{ secrets.PASSWORD }}
+        key: ${{ secrets.KEY }}
+        port: ${{ secrets.PORT }}
+        script: |
+          cd numeris
+          git pull
+          docker-compose -f docker-compose.infra.yml pull
+          docker-compose -f docker-compose.infra.yml rm -f front back
+          docker-compose -f docker-compose.infra.yml up -d front back
+          docker system prune -a
+          # storage is limited so we clean

.github/workflows/staging.yml

@@ -0,0 +1,91 @@
+name: Deploy staging
+
+on:
+  push:
+    branches:
+      - "staging"
+    tags:
+      - v*
+
+jobs:
+  build-front:
+    name: Build and push front
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push front
+      uses: docker/build-push-action@v3
+      with:
+        build-args: ENVIRONMENT=staging
+        context: front
+        file: front/Dockerfile.production
+        push: true
+        tags: numerisisep/numeris-front:staging
+        cache-from: type=gha
+        cache-to: type=gha
+
+  build-back:
+    name: Build and push back
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push back
+      uses: docker/build-push-action@v3
+      with:
+        build-args: ENVIRONMENT=staging
+        context: back
+        file: back/Dockerfile.production
+        push: true
+        tags: numerisisep/numeris-back:staging
+        cache-from: type=gha
+        cache-to: type=gha
+
+  pull-and-recreate:
+    name: Pull and recreate
+    needs:
+      - build-front
+      - build-back
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote ssh commands using password
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+          # password: ${{ secrets.PASSWORD }}
+        key: ${{ secrets.KEY }}
+        port: ${{ secrets.PORT }}
+        script: |
+          cd numeris
+          git pull
+          docker-compose -f docker-compose.infra.yml pull
+          docker-compose -f docker-compose.infra.yml rm -f front-staging back-staging
+          docker-compose -f docker-compose.infra.yml up -d front-staging back-staging
+          docker system prune -a
+          # storage is limited so we clean

.github/workflows/test.yml

@@ -0,0 +1,111 @@
+name: Test docker build
+
+on:
+  push:
+    branches:
+      - "*"
+      - "!master"
+      - "!staging"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+jobs:
+  back-prod:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Fake env file
+      run: touch .env
+
+    - name: Build back prod
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile.production
+        push: false
+        tags: numerisisep/back:prod
+        cache-from: type=gha
+        cache-to: type=gha
+
+  front-prod:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Fake env file
+      run: touch .env
+
+    - name: Build front prod
+      uses: docker/build-push-action@v3
+      with:
+        context: front
+        dockerfile: Dockerfile.production
+        push: false
+        tags: numerisisep/front:prod
+        cache-from: type=gha
+        cache-to: type=gha
+
+  back-dev:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Fake env file
+      run: touch .env
+
+    - name: Build back dev
+      uses: docker/build-push-action@v3
+      with:
+        context: back
+        dockerfile: Dockerfile
+        push: false
+        tags: numerisisep/back:dev
+        cache-from: type=gha
+        cache-to: type=gha
+
+  front-dev:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Fake env file
+      run: touch .env
+
+    - name: Build front dev
+      uses: docker/build-push-action@v3
+      with:
+        context: front
+        dockerfile: Dockerfile
+        push: false
+        tags: numerisisep/front:dev
+        cache-from: type=gha
+        cache-to: type=gha

.gitignore

@@ -1,4 +1,5 @@
 .idea/
 .vscode/
 .env
-var/
+.env*
+var/

README.md

@@ -1,6 +1,10 @@
+[![Deploy production](https://github.com/numeris-isep/numeris-v2/actions/workflows/prod.yml/badge.svg?branch=master)](https://github.com/numeris-isep/numeris-v2/actions/workflows/prod.yml)
+[![Deploy staging](https://github.com/numeris-isep/numeris-v2/actions/workflows/staging.yml/badge.svg?branch=staging)](https://github.com/numeris-isep/numeris-v2/actions/workflows/staging.yml)
+[![Test docker build](https://github.com/numeris-isep/numeris-v2/actions/workflows/test.yml/badge.svg)](https://github.com/numeris-isep/numeris-v2/actions/workflows/test.yml)
+
 # Numeris-v2
 
-[![Build Status](https://travis-ci.com/2Seg/numeris-v2.svg?branch=master)](https://travis-ci.com/2Seg/numeris-v2)
+<!-- [![Build Status](https://travis-ci.com/2Seg/numeris-v2.svg?branch=master)](https://travis-ci.com/2Seg/numeris-v2) -->
 
 > Created and maintened by [2Seg](https://github.com/2Seg)
 

back/.dockerignore

@@ -1,4 +1,8 @@
+Dockerfile
+Dockerfile.production
 .DS_Store
 vendor
 public/storage
 public/build
+.env
+.env.template

back/Dockerfile

@@ -17,11 +17,15 @@ RUN docker-php-ext-install pdo_mysql gd zip
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 # Enable apache conf
 COPY docker/apache/numeris.conf /etc/apache2/sites-available/numeris.conf
-RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && service apache2 restart
+RUN a2dissite 000-default.conf && \
+      a2ensite numeris.conf && \
+      a2enmod headers && \
+      a2enmod rewrite && \
+      service apache2 restart
 # 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 +35,8 @@ 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" ]
+ENTRYPOINT ["php", "artisan", "serve", "--host", "0.0.0.0", "--port", "8080"]

back/Dockerfile.production

@@ -15,11 +15,15 @@ RUN docker-php-ext-install pdo_mysql gd zip
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 # Enable apache conf
 COPY docker/apache/numeris.conf /etc/apache2/sites-available/numeris.conf
-RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && service apache2 restart
+RUN a2dissite 000-default.conf && \
+      a2ensite numeris.conf && \
+      a2enmod headers && \
+      a2enmod rewrite && \
+      service apache2 restart
 # 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 +33,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/composer.json

@@ -1,7 +1,11 @@
 {
     "name": "2seg/numeris-v2",
     "description": "Home of the new website of Numéris.",
-    "keywords": ["Numéris", "association", "website"],
+    "keywords": [
+        "Numéris",
+        "association",
+        "website"
+    ],
     "license": "MIT",
     "type": "project",
     "authors": [
@@ -14,6 +18,11 @@
             "name": "MinhNam Nguyen",
             "email": "nguyen.minhnam@hotmail.fr",
             "role": "Developer"
+        },
+        {
+            "name": "Marc Partensky",
+            "email": "marc@marcpartensky.com",
+            "role": "Developer"
         }
     ],
     "require": {
@@ -51,8 +60,7 @@
     },
     "extra": {
         "laravel": {
-            "dont-discover": [
-            ]
+            "dont-discover": []
         }
     },
     "scripts": {

back/docker/apache/numeris.conf

@@ -6,10 +6,22 @@
     # Force HTTPS when X-Forwarded-Proto is passed as HTTPS
     # Useful when the reverse proxy is in HTTPS
     SetEnvIf x-forwarded-proto https HTTPS=on
+    # Header set Access-Control-Allow-Origin "*"
+    # Header set Access-Control-Allow-Origin "numeris-isep.fr"
+    # Header add Access-Control-Allow-Origin "https://numeris-isep.fr"
+    # Header add Access-Control-Allow-Origin "https://staging.numeris-isep.fr"
+    # Header always append Access-Control-Allow-Origin: "https://numeris-isep.fr"
+    # Header always append Access-Control-Allow-Origin: "https://staging.numeris-isep.fr"
+    # Header always append Access-Control-Allow-Origin: "https://api.numeris-isep.fr"
+    # Header always append Access-Control-Allow-Origin: "https://api.staging.numeris-isep.fr"
+    SetEnvIf Origin "http(s)?://(www\.)?(staging\.)?numeris-isep.fr$" AccessControlAllowOrigin=$0
+    Header add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
+    Header set Access-Control-Allow-Credentials true
     AllowOverride All
     Require all granted
+    LogLevel debug
   </Directory>
 
-  ErrorLog /var/log/apache2/numeris-error.log
-  CustomLog /var/log/apache2/numeris-access.log combined
+  ErrorLog /var/log/apache2/error.log
+  CustomLog /var/log/apache2/access.log combined
 </VirtualHost>

back/entrypoint.sh

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

docker-compose.infra.yml

@@ -0,0 +1,116 @@
+version: "3.9"
+services:
+
+  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"]
+
+  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}}"
+
+  mysql:
+    image: mysql:5.7
+    container_name: numeris_mysql
+    restart: unless-stopped
+    networks:
+      - mysql
+    ports:
+      - 127.0.0.1:3306:3306
+    env_file:
+      - .env
+    volumes:
+    - ./var/mysql:/var/lib/mysql
+    # - /var/run/mysqld:/var/run/mysqld
+
+  back:
+    image: numerisisep/numeris-back:prod
+    container_name: numeris_back
+    restart: unless-stopped
+    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}}"
+
+  front:
+    image: numerisisep/numeris-front:prod
+    container_name: numeris_front
+    restart: unless-stopped
+    networks:
+      - caddy
+    labels:
+      caddy: numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
+
+
+  back-staging:
+    image: numerisisep/numeris-back:staging
+    container_name: numeris_back_staging
+    restart: unless-stopped
+    networks:
+      - caddy
+      - mysql
+    env_file:
+      - .env.staging
+    volumes:
+      - .env.staging:/home/numeris/.env
+    depends_on:
+      - mysql
+    labels:
+      caddy: api.staging.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
+
+  front-staging:
+    image: numerisisep/numeris-front:staging
+    container_name: numeris_front_staging
+    restart: unless-stopped
+    networks:
+      - caddy
+    labels:
+      caddy: staging.numeris-isep.fr
+      caddy.reverse_proxy: "{{upstreams 80}}"
+
+networks:
+  caddy:
+    name: caddy
+    # external: true
+    attachable: true
+  mysql:
+
+volumes:
+  caddy_data:
+  mysql:

docker-compose.production.yml

@@ -1,34 +0,0 @@
-version: "3.9"
-services:
-
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    restart: unless-stopped
-    ports:
-      - 3000:80
-    links:
-      - mysql:db
-    depends_on:
-      - mysql
-
-  mysql:
-    image: mysql:5.7
-    restart: unless-stopped
-    env_file:
-      - .env
-    volumes:
-    - mysql:/var/lib/mysql
-
-  back:
-    build:
-      context: ./back
-      dockerfile: Dockerfile
-    env_file:
-      - .env
-    links:
-    - mysql
-    depends_on:
-    - mysql
-
-volumes:
-  mysql:

docker-compose.testing.yml

@@ -1,28 +0,0 @@
-version: '3'
-services:
-
-  mysql:
-    image: mysql:5.7
-    environment:
-      MYSQL_DATABASE: 'numeris_testing'
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-    container_name: numeris_mysql
-
-  back:
-    build:
-      context: ./back
-      dockerfile: Dockerfile
-    environment:
-      DB_CONNECTION: testing
-      DB_HOST_TESTING: mysql
-      DB_PORT_TESTING: 3306
-      DB_DATABASE_TESTING: numeris_testing
-      DB_USERNAME_TESTING: root
-      DB_PASSWORD_TESTING:
-    ports:
-      - 8080:80
-    links:
-      - mysql
-    depends_on:
-      - mysql
-    container_name: numeris_back

docker-compose.yml

@@ -3,45 +3,46 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
     ports:
       - 3000:80
     links:
       - mysql:db
     depends_on:
       - mysql
-    container_name: numeris_phpmyadmin
 
   mysql:
     image: mysql:5.7
-    environment:
-      MYSQL_DATABASE: 'numeris'
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     container_name: numeris_mysql
+    environment:
+      MYSQL_DATABASE: 'numeris_testing'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
 
   back:
+    image: numerisisep/back:dev
+    container_name: numeris_back
     build:
       context: ./back
       dockerfile: Dockerfile
-    env_file:
-      - back/.env
     environment:
-      DB_HOST: ${DB_HOST}
-      DB_PORT: ${DB_PORT}
-      DB_DATABASE: ${DB_DATABASE}
-      DB_USERNAME: ${DB_USERNAME}
-      DB_PASSWORD: ${DB_PASSWORD}
+      DB_HOST: mysql
+      DB_PORT: 3306
+      DB_DATABASE: numeris_testing
+      DB_USERNAME: root
+      DB_PASSWORD: ""
     volumes:
       - ./back:/home/numeris
       - /home/numeris/vendor
     ports:
-      - ${BACK_PORT}:80
+      - ${BACK_PORT:-8000}:8000
     links:
       - mysql
     depends_on:
       - mysql
-    container_name: numeris_back
 
   front:
+    image: numerisisep/front:dev
+    container_name: numeris_front
     build:
       context: ./front
       dockerfile: Dockerfile
@@ -50,9 +51,5 @@ services:
       - /home/numeris/node_modules
     links:
       - back
-    expose:
-      - ${FRONT_PORT}
     ports:
-      - ${FRONT_PORT}:${FRONT_PORT}
-    command: ng s --host 0.0.0.0
-    container_name: numeris_front
+      - ${FRONT_PORT:-8080}:80

front/.dockerignore

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

front/Dockerfile

@@ -1,18 +1,9 @@
-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 . /home/numeris
-
-RUN npm rebuild node-sass
-
-WORKDIR /home/numeris
+FROM node:11.15.0 as builder
+WORKDIR /opt/numeris
+ENV PATH /opt/numeris/node_modules/.bin:$PATH
+COPY package.json yarn.lock /opt/numeris/
+RUN yarn install
+# RUN yarn add -g @angular/cli@7.3.9
+COPY . .
+RUN yarn run build
+ENTRYPOINT [ "ng", "serve", "--port", "80" ]

front/Dockerfile.production

@@ -0,0 +1,18 @@
+FROM node:11.15.0 as builder
+ARG ENVIRONMENT=production
+WORKDIR /opt/numeris
+ENV PATH /opt/numeris/node_modules/.bin:$PATH
+COPY package.json /opt/numeris/
+COPY yarn.lock /opt/numeris/
+RUN yarn install
+COPY . .
+RUN yarn run build-$ENVIRONMENT
+ENTRYPOINT [ "ng", "serve", "--configuration", "$ENVIRONMENT", "--port", "80" ]
+
+FROM nginx
+COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+COPY nginx/mime.types /etc/nginx/mime.types
+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/angular.json

@@ -47,6 +47,25 @@
               "buildOptimizer": true,
               "serviceWorker": true,
               "ngswConfigPath": "src/ngsw-config.json"
+            },
+            "staging": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.staging.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "serviceWorker": true,
+              "ngswConfigPath": "src/ngsw-config.json"
             }
           }
         },

front/nginx/mime.types

@@ -0,0 +1,100 @@
+
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/plain                                       js;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/avif                                       avif;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

front/nginx/nginx.conf

@@ -0,0 +1,18 @@
+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;
+        # types { application/octet-stream .pdf; }
+    }
+    location ~* \.pdf$ {
+        add_header Content-disposition "attachment; filename=$1";
+    }
+}

front/package.json

@@ -6,7 +6,8 @@
     "start": "ng serve",
     "start-http": "http-server -c-1 dist",
     "build": "ng build",
-    "build-prod": "ng build --prod --output-path dist",
+    "build-production": "ng build --prod --c=production --output-path dist",
+    "build-staging": "ng build --prod -c=staging --output-path dist",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
@@ -60,6 +61,6 @@
     "protractor": "~5.4.2",
     "ts-node": "~8.0.3",
     "tslint": "~5.14.0",
-    "typescript": "^3.2.4"
+    "typescript": "3.1.1"
   }
 }

front/src/environments/environment.staging.ts

@@ -0,0 +1,8 @@
+export const environment = {
+  production: true,
+  apiUrl: 'https://api.staging.numeris-isep.fr',
+  tokenName: 'numeris_token',
+  savEmail: 'sav.numeris@gmail.com',
+  messengerUrl: 'http://m.me/numerisisep',
+  captchaKey: '6Le3-skUAAAAAFQd5ffXB1PnyQUQDPsgQH4n1neo',
+};