Browse Source

update conflict

pull/3/head
Ibnu Hamdani 2 years ago
parent
commit
83ab9ac99d
  1. 4
      Dockerfile
  2. 8
      docker-compose.yml

4
Dockerfile

@ -28,8 +28,8 @@ WORKDIR /var/www/html
COPY . . COPY . .
RUN chmod +x artisan 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 . RUN chown -R www-data:www-data .

8
docker-compose.yml

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

Loading…
Cancel
Save