From 50d6611e373e8f6fb2b919c206b9bca35a9a8ba2 Mon Sep 17 00:00:00 2001 From: Mirko Janssen Date: Mon, 13 Oct 2025 13:55:11 +0200 Subject: [PATCH] use native "docker compose" command --- Makefile | 30 +++++++++++++++--------------- README.md | 3 --- docker/Dockerfile | 2 +- documentation/docker-setup.md | 24 ++++++++++++------------ 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 59392e6..48eb37e 100644 --- a/Makefile +++ b/Makefile @@ -50,55 +50,55 @@ help: # Docker Management up: - export USER_ID=$$(id -u) && export GROUP_ID=$$(id -g) && docker-compose up -d --build + export USER_ID=$$(id -u) && export GROUP_ID=$$(id -g) && docker compose up -d --build down: - docker-compose down + docker compose down shell: - docker-compose exec app bash + docker compose exec app bash # Composer Commands install: - docker-compose exec app composer install + docker compose exec app composer install dump-autoload: - docker-compose exec app composer dump-autoload + docker compose exec app composer dump-autoload # Testing Commands test: - docker-compose exec app composer test + docker compose exec app composer test test-coverage: - docker-compose exec app composer test-coverage + docker compose exec app composer test-coverage test-unit: - docker-compose exec app composer test-unit + docker compose exec app composer test-unit test-integration: - docker-compose exec app composer test-integration + docker compose exec app composer test-integration # Static Analysis Commands phpstan: - docker-compose exec app composer phpstan + docker compose exec app composer phpstan phpstan-baseline: - docker-compose exec app composer phpstan-baseline + docker compose exec app composer phpstan-baseline deptrac: - docker-compose exec app composer deptrac + docker compose exec app composer deptrac deptrac-baseline: - docker-compose exec app composer deptrac-baseline + docker compose exec app composer deptrac-baseline static-analysis: phpstan deptrac # Code Quality Commands rector: - docker-compose exec app composer rector + docker compose exec app composer rector rector-fix: - docker-compose exec app composer rector-fix \ No newline at end of file + docker compose exec app composer rector-fix \ No newline at end of file diff --git a/README.md b/README.md index 91b1c27..74e9924 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,6 @@ A small PHP framework built with Domain-Driven Design principles, Slim microfram # Start development environment (recommended) make up make install - - # Alternative: automated setup script - ./docker-start.sh ``` 1. **Access Application**: diff --git a/docker/Dockerfile b/docker/Dockerfile index 898e871..a0d99b7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,7 +31,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer # Configure Apache RUN a2enmod rewrite -# Create a user with same UID as host user (will be overridden by docker-compose) +# Create a user with same UID as host user (will be overridden by docker compose) ARG USER_ID=1000 ARG GROUP_ID=1000 RUN groupadd -g ${GROUP_ID} appuser && \ diff --git a/documentation/docker-setup.md b/documentation/docker-setup.md index 8c77020..10379f4 100644 --- a/documentation/docker-setup.md +++ b/documentation/docker-setup.md @@ -115,46 +115,46 @@ DB_PASSWORD=foundation_password ```bash # Start services -docker-compose up -d +docker compose up -d # Stop services -docker-compose down +docker compose down # Restart a service -docker-compose restart app +docker compose restart app # View logs -docker-compose logs app +docker compose logs app # Access container shell -docker-compose exec app bash +docker compose exec app bash ``` ### Application Commands ```bash # Install dependencies -docker-compose exec app composer install +docker compose exec app composer install # Run tests (when available) -docker-compose exec app vendor/bin/phpunit +docker compose exec app vendor/bin/phpunit # Clear logs -docker-compose exec app rm -f storage/logs/* +docker compose exec app rm -f storage/logs/* # Check PHP version -docker-compose exec app php -v +docker compose exec app php -v ``` ### Database Commands ```bash # Access MySQL CLI -docker-compose exec db mysql -u foundation_user -p foundation +docker compose exec db mysql -u foundation_user -p foundation # Import SQL file -docker-compose exec -T db mysql -u foundation_user -pfoundation_password foundation < database/schema.sql +docker compose exec -T db mysql -u foundation_user -pfoundation_password foundation < database/schema.sql # Export database -docker-compose exec db mysqldump -u foundation_user -pfoundation_password foundation > backup.sql +docker compose exec db mysqldump -u foundation_user -pfoundation_password foundation > backup.sql ```