fixed the back

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

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"
   }
 }