bye events

This reverts commit b466e5b6ee.

.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

@@ -0,0 +1,48 @@
+name: Docker build test
+
+on:
+  push:
+    branches:
+      - "*"
+      - "!master"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+jobs:
+  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: Fake env file
+      run: touch .env
+
+    - name: Build
+      run: docker-compose -f docker-compose.production.yml build back
+
+  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: Fake env file
+      run: touch .env
+
+    - name: Build
+      run: docker-compose -f docker-compose.production.yml build front

.github/workflows/docker.yml

@@ -0,0 +1,89 @@
+name: Docker
+
+on:
+  schedule:
+  - cron: "0 4 * * 0" # run every sunday at 4 am to test if the image builds correctly given that changes of debian or compose packages can break the image
+  push:
+    branches:
+      - "master"
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+  # Run tests for any PRs.
+  pull_request:
+
+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
+        dockerfile: Dockerfile
+        push: true
+        tags: numerisisep/numeris-front:latest
+
+  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
+        dockerfile: Dockerfile.production
+        push: true
+        tags: numerisisep/numeris-back:latest
+
+
+  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.production.yml pull
+          docker-compose -f docker-compose.production.yml up -d --force-recreate

back/.dockerignore

@@ -2,3 +2,5 @@
 vendor
 public/storage
 public/build
+.env
+.env.template

back/Dockerfile

@@ -1,6 +1,4 @@
-FROM php:7.2-apache
-
-RUN mkdir -p /home/numeris
+FROM php:7.4-apache
 
 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -8,7 +6,9 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nano \
-    libpng-dev
+    libpng-dev \
+    libzip-dev
+
 
 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -21,18 +21,17 @@ 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
 
-COPY . /home/numeris
+WORKDIR /home/numeris
+COPY . .
 
 # Composer install
-WORKDIR /home/numeris
 RUN composer install --no-interaction
 
 # Final touch
-RUN . ~/.bashrc
 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 /home/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
 
-WORKDIR /home/numeris
+ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/Dockerfile.production

@@ -1,6 +1,4 @@
-FROM php:7.2-apache
-
-RUN mkdir -p /home/numeris
+FROM php:7.4-apache
 
 # Install packages
 RUN apt-get update && apt-get install -y \
@@ -8,7 +6,8 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     nano \
-    libpng-dev
+    libpng-dev \
+    libzip-dev
 
 # Install the PHP mcrypt pdo_mysql extension
 RUN docker-php-ext-install pdo_mysql gd zip
@@ -20,21 +19,20 @@ 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
 
-COPY . /home/numeris
+WORKDIR /home/numeris
+COPY . .
 
 ### Back config ###
-WORKDIR /home/numeris
 RUN composer install --optimize-autoloader --no-dev --no-interaction
 
 # Final touch
-RUN . ~/.bashrc
 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 /home/numeris
 RUN chown -R www-data:www-data /var/log/apache2/
 
-WORKDIR /home/numeris
-
 RUN php artisan config:cache
 RUN php artisan route:cache
+
+ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]

back/entrypoint.sh

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

docker-compose.production.yml

@@ -3,39 +3,121 @@ services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    container_name: numeris_phpmyadmin
     restart: unless-stopped
-    ports:
-      - 3000:80
     links:
       - mysql:db
     depends_on:
       - mysql
+    networks:
+      - traefik
+      - mysql
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.phpmyadmin.rule: Host(`phpmyadmin.numeris-isep.fr`)
+      traefik.http.routers.phpmyadmin.entrypoints: websecure
+      traefik.http.routers.phpmyadmin.tls.certresolver: tls
+      traefik.http.services.phpmyadmin.loadbalancer.server.port: 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:
+    image: numerisisep/numeris-back
+    container_name: numeris_back
     restart: unless-stopped
     build:
       context: ./back
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.production
+    networks:
+      - traefik
+      - mysql
     env_file:
       - .env
+    volumes:
+      - .env:/home/numeris/.env
     depends_on:
-    - mysql
+      - mysql
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.back.rule: Host(`api.numeris-isep.fr`)
+      traefik.http.routers.back.entrypoints: websecure
+      traefik.http.routers.back.tls.certresolver: tls
+      traefik.http.services.back.loadbalancer.server.port: 80
 
   front:
+    image: numerisisep/numeris-front
+    container_name: numeris_front
     build:
       context: ./front
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.production
+    networks:
+      - traefik
     depends_on:
       - back
-    entrypoint: ng s --host 0.0.0.0
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.front.rule: Host(`numeris-isep.fr`)
+      traefik.http.routers.front.entrypoints: websecure
+      traefik.http.routers.front.tls.certresolver: tls
+      traefik.http.services.front.loadbalancer.server.port: 80
+
+  traefik:
+    image: traefik
+    restart: unless-stopped
+    command:
+    #   ## Provider Settings - https://docs.traefik.io/providers/docker/#provider-configuration ##
+    #   # - --providers.docker.exposedbydefault=false # <== Don't expose every container to traefik, only expose enabled ones
+    #   - --providers.file.filename=/dynamic.yaml # <== Referring to a dynamic configuration file
+      - --providers.docker.network=web # <== Operate on the docker network named web
+      - --providers.docker=true # <== Enabling docker as the provider for traefik
+    #   ## API Settings - https://docs.traefik.io/operations/api/, endpoints - https://docs.traefik.io/operations/api/#endpoints ##
+    #   - --api.insecure=false # <== Enabling insecure api, NOT RECOMMENDED FOR PRODUCTION
+      - --api.dashboard=true
+      - --api.debug=true # <== Enabling additional endpoints for debugging and profiling
+    #   ## Entrypoints Settings - https://docs.traefik.io/routing/entrypoints/#configuration ##
+      - --entrypoints.web.address=:80
+      - --entrypoints.websecure.address=:443
+      # - --certificatesresolvers.tls.acme.email = support@numeris-isep.fr
+      # - --certificatesresolvers.tls.acme.tlschallenge=true # <== Enable TLS-ALPN-01 to generate and renew ACME certs - --certificatesresolvers.tls.acme.email=marc.partensky@gmail.com
+      # - --certificatesresolvers.tls.acme.storage=/letsencrypt/acme.json # Log Settings (options: ERROR, DEBUG, PANIC, FATAL, WARN, INFO) - https://docs.traefik.io/observability/logs/ ##
+      - --certificatesresolvers.tls.acme.email=support@numeris-isep.fr
+      - --certificatesresolvers.tls.acme.tlschallenge=true # <== Enable TLS-ALPN-01 to generate and renew ACME certs - --certificatesresolvers.tls.acme.email=marc.partensky@gmail.com
+      - --certificatesresolvers.tls.acme.storage=/letsencrypt/acme.json # Log Settings (options: ERROR, DEBUG, PANIC, FATAL, WARN, INFO) - https://docs.traefik.io/observability/logs/ ##
+      - --log.level=DEBUG # <== Setting the level of the logs from traefik
+      - --entrypoints.web.http.redirections.entryPoint.to=websecure
+      - --entrypoints.web.http.redirections.entryPoint.scheme=https
+      - --entrypoints.web.http.redirections.entrypoint.permanent=true
+    ports:
+      - "80:80"
+      - "443:443"
+    networks:
+      - traefik
+    volumes:
+      # - ./traefik.yml:/traefik.yml # static configuration
+      # - ./dynamic.yml:/dynamic.yml
+      - traefik_letsencrypt:/letsencrypt
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.traefik.rule: Host(`traefik.numeris-isep.fr`)
+      traefik.http.routers.traefik.service: api@internal
+      traefik.http.routers.traefik.entrypoints: websecure
+      traefik.http.routers.traefik.tls.certresolver: tls
+      traefik.docker.network: traefik
+
+networks:
+  traefik:
+  mysql:
 
 volumes:
+  traefik_letsencrypt:
   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: numerisisep/numeris-back
     container_name: numeris_back
+    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile
@@ -38,12 +44,14 @@ services:
       - mysql
 
   front:
+    image: numerisisep/numeris-front
     container_name: numeris_front
+    restart: unless-stopped
     build:
       context: ./front
       dockerfile: Dockerfile
     ports:
-      - 4200:4200
+      - 8000:80
     links:
       - back
     depends_on:

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,17 @@
+http {
+    include /etc/nginx/mime.types;
+    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"
   }
 }