update conflict

Dockerfile

@@ -28,8 +28,8 @@ WORKDIR /var/www/html
 COPY . .
 
 RUN chmod +x artisan
-#RUN composer install --ignore-platform-reqs --prefer-dist --no-scripts --no-progress --no-interaction --no-dev --no-autoloader
+RUN composer install --ignore-platform-reqs --prefer-dist --no-scripts --no-progress --no-interaction --no-dev --no-autoloader
-#RUN composer dump-autoload --optimize
+RUN composer dump-autoload --optimize
 
 RUN chown -R www-data:www-data .
 

docker-compose.yml

@@ -5,10 +5,10 @@ services:
         restart: unless-stopped
         tty: true
         ports:
-            - '80:80'
+            - '8444:80'
-            - '443:443'
+            - '8555:443'
         volumes:
-            - .:/var/www/html:ro,cached
+            - .:/var/www/html
             - ./docker/nginx/conf.d/:/etc/nginx/conf.d/
         links:
             - app
@@ -30,7 +30,7 @@ services:
             - POSTGRES_USER=postgres
             - POSTGRES_PASSWORD=postgres
         ports:
-            - '5432:5432'
+            - '5435:5432'
         networks:
             - ospro
         volumes: