test dev

back/Dockerfile

@@ -17,7 +17,11 @@ 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
 

docker-compose.production.yml

@@ -24,10 +24,13 @@ services:
     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

docker-compose.yml

@@ -25,16 +25,16 @@ services:
     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
+      DB_USERNAME: root
+      DB_PASSWORD:
     volumes:
       - ./back:/home/numeris
       - /home/numeris/vendor
     ports:
-      - ${BACK_PORT}:80
+      - ${BACK_PORT:-8000}:80
     links:
       - mysql
     depends_on:
@@ -50,9 +50,7 @@ services:
       - /home/numeris/node_modules
     links:
       - back
-    expose:
-      - ${FRONT_PORT}
     ports:
-      - ${FRONT_PORT}:${FRONT_PORT}
+      - ${FRONT_PORT:-8080}:80
     command: ng s --host 0.0.0.0
     container_name: numeris_front

front/Dockerfile

@@ -6,4 +6,4 @@ 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" ]
+ENTRYPOINT [ "ng", "serve", "--port", "80" ]