diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 549c9f9..4bfab31 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,7 +9,7 @@ services: volumes: - ..:/var/www/html env_file: - - ./env/.env.app + - ../.env networks: - thankcard-system-network extra_hosts: @@ -28,6 +28,16 @@ services: networks: - thankcard-system-network + node: + image: node:20-alpine + container_name: thankcard-system-node + working_dir: /var/www/html + volumes: + - ..:/var/www/html + command: sh -c "npm install && npm run build" + networks: + - thankcard-system-network + networks: thankcard-system-network: name: thankcard-system-network diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh index 41971f4..468dcee 100644 --- a/docker/php/entrypoint.sh +++ b/docker/php/entrypoint.sh @@ -3,9 +3,8 @@ set -e cd /var/www/html -if [ ! -f "vendor/autoload.php" ]; then - composer install -fi +# Luôn chạy composer install để đảm bảo vendor được cập nhật +composer install --no-interaction --prefer-dist mkdir -p storage/logs \ storage/framework/cache \ diff --git a/package-lock.json b/package-lock.json index f50f84c..c8659ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "thankcard-system", + "name": "html", "lockfileVersion": 3, "requires": true, "packages": {