home is back instead of opt

back/.dockerignore

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

back/Dockerfile.production

@@ -15,11 +15,7 @@ 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 headers && \
-      a2enmod rewrite && \
-      service apache2 restart
+RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && service apache2 restart
 # Enable php conf
 COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
 

back/docker/apache/numeris.conf

@@ -6,9 +6,6 @@
     # 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

@@ -1,12 +1,8 @@
 #!/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
+php artisan key:generate --force
+php artisan jwt:secret --force
+php artisan migrate:refresh --seed --force
 
 docker-php-entrypoint
 apache2-foreground

docker-compose.production.yml

@@ -1,42 +1,34 @@
-version: '3'
+version: "3.9"
 services:
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin:latest
+    restart: unless-stopped
     ports:
       - 3000:80
     links:
       - mysql:db
     depends_on:
       - mysql
-    container_name: numeris_phpmyadmin
 
   mysql:
     image: mysql:5.7
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: 'numeris'
+    restart: unless-stopped
+    env_file:
+      - .env
     volumes:
-    - ./var/mysql:/var/lib/mysql
-    container_name: numeris_mysql
+    - mysql:/var/lib/mysql
 
   back:
     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
+      dockerfile: Dockerfile
+    env_file:
+      - .env
     links:
     - mysql
     depends_on:
     - mysql
-    container_name: numeris_back
+
+volumes:
+  mysql:

front/Dockerfile

@@ -1,18 +1,16 @@
 FROM node:11.15.0
 
-RUN mkdir -p /home/numeris
-
+WORKDIR /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
+COPY . .
 
 RUN npm rebuild node-sass
 
-WORKDIR /home/numeris
+ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]