fixed the back

.dockerignore

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

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
@@ -16,25 +15,28 @@ 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
 
-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/docker/apache/numeris.conf

@@ -6,6 +6,9 @@
     # 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 set Access-Control-Allow-Origin "https://numeris-isep.fr"
     AllowOverride All
     Require all granted
   </Directory>

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.production.yml

@@ -1,90 +1,42 @@
-version: "3.9"
+version: '3'
 services:
 
   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}}"
+    container_name: numeris_phpmyadmin
 
   mysql:
     image: mysql:5.7
-    container_name: numeris_mysql
-    restart: unless-stopped
-    networks:
-      - mysql
-    env_file:
-      - .env
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: 'numeris'
     volumes:
     - ./var/mysql:/var/lib/mysql
+    container_name: numeris_mysql
 
   back:
-    image: numerisisep/numeris-back
-    container_name: numeris_back
-    restart: unless-stopped
     build:
       context: ./back
       dockerfile: Dockerfile.production
-    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}}"
-        # caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
-
-  front:
-    image: numerisisep/numeris-front
-    container_name: numeris_front
-    build:
-      context: ./front
-      dockerfile: Dockerfile.production
-    networks:
-      - caddy
-    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
+      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:
-      - "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:
+      - ${BACK_PORT}:80
+    links:
+    - mysql
+    depends_on:
+    - mysql
+    container_name: numeris_back

docker-compose.testing.yml

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