From 1a89d73886e6a303aea5dd94e7cdfcf68ed56437 Mon Sep 17 00:00:00 2001 From: armiejean Date: Wed, 30 Apr 2025 10:28:58 +0800 Subject: [PATCH] docker-compose.yml --- docker-compose.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 90a26dc..15c1855 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: build: context: ./docker/php dockerfile: Dockerfile - container_name: laravel-app + container_name: laravel restart: always working_dir: /var/www volumes: @@ -15,15 +15,9 @@ services: db_mysql: condition: service_healthy command: > - /bin/sh -c ' - mkdir -p /var/www/storage /var/www/bootstrap/cache && - chown -R www-data:www-data /var/www/storage /var/www/bootstrap/cache && - chmod -R 775 /var/www/storage /var/www/bootstrap/cache && - composer install --no-dev --optimize-autoloader && - php artisan migrate --force && - php-fpm ' + /bin/sh -c ' mkdir -p /var/www/storage /var/www/bootstrap/cache && chown -R www-data:www-data /var/www/storage /var/www/bootstrap/cache && chmod -R 775 /var/www/storage /var/www/bootstrap/cache && composer install --no-dev --optimize-autoloader && php artisan migrate --force && php-fpm ' healthcheck: - test: ["CMD", "sh", "-c", "pgrep php-fpm"] + test: [ "CMD", "sh", "-c", "pgrep php-fpm" ] interval: 30s timeout: 10s retries: 10 @@ -32,8 +26,8 @@ services: # MySQL db_mysql: - image: mysql:8.0 - container_name: db_mysql + image: mysql:8.0 + container_name: db restart: always environment: MYSQL_ROOT_PASSWORD: newpassword @@ -44,7 +38,7 @@ services: volumes: - mysql-data:/var/lib/mysql healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-pnewpassword"] + test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-pnewpassword" ] interval: 10s timeout: 5s retries: 5 @@ -54,10 +48,10 @@ services: # Nginx web: image: nginx:1.26.3-alpine - container_name: web + container_name: web-unioil restart: always ports: - - "8000:80" + - "8080:80" volumes: - .:/var/www - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:rw @@ -65,7 +59,7 @@ services: app: condition: service_healthy healthcheck: - test: ["CMD", "curl", "-f", "http://localhost"] + test: [ "CMD", "curl", "-f", "http://localhost" ] interval: 30s timeout: 10s retries: 5 @@ -75,6 +69,7 @@ services: volumes: mysql-data: + networks: app_network: driver: bridge