feat: update Docker configuration for SSL support and improve service registration (#26)

Reviewed-on: #26
Co-authored-by: Ron Rise <ron@siteworxpro.com>
Co-committed-by: Ron Rise <ron@siteworxpro.com>

.dev/docker-compose.yml

@@ -5,6 +5,12 @@ volumes:
 services:
 
   traefik:
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.traefik.entrypoints=web-secure"
+      - "traefik.http.routers.traefik.rule=Host(`127.0.0.1`) && (PathPrefix(`/dashboard`) || PathPrefix(`/api`))"
+      - "traefik.http.routers.traefik.tls=true"
+      - "traefik.http.routers.traefik.service=api@internal"
     image: traefik:latest
     container_name: traefik
     healthcheck:
@@ -15,15 +21,20 @@ services:
     ports:
       - "80:80"
       - "443:443"
+      - "9001:9001"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
+      - "./ssl:/etc/ssl"
     restart: always
     command:
       - "--providers.docker=true"
+      - "--api.insecure=true"
       - "--ping"
+      - "--providers.file.filename=/etc/ssl/traefik.yml"
       - "--providers.docker.exposedByDefault=false"
       - "--entrypoints.web.address=:80"
       - "--entrypoints.web-secure.address=:443"
+      - "--entrypoints.grpc.address=:9001"
       - "--accesslog=true"
       - "--entrypoints.web.http.redirections.entryPoint.to=web-secure"
       - "--entrypoints.web.http.redirections.entryPoint.scheme=https"
@@ -31,7 +42,7 @@ services:
 
   composer-runtime:
     volumes:
-      - .:/app
+      - ..:/app
     image: siteworxpro/composer
     entrypoint: "/bin/sh -c 'while true; do sleep 30; done;'"
     environment:
@@ -53,8 +64,8 @@ services:
 
   migration-container:
     volumes:
-      - ./db/migrations:/app/db/migrations
+      - ../db/migrations:/app/db/migrations
-      - ./bin:/app/bin
+      - ../bin:/app/bin
     image: siteworxpro/migrate:v4.18.3
     working_dir: /app
 #    entrypoint: "/bin/sh -c 'while true; do sleep 30; done;'"
@@ -79,12 +90,19 @@ services:
       - "traefik.http.services.api.loadbalancer.healthcheck.path=/healthz"
       - "traefik.http.services.api.loadbalancer.healthcheck.interval=5s"
       - "traefik.http.services.api.loadbalancer.healthcheck.timeout=60s"
+      - "traefik.tcp.services.api.loadbalancer.server.port=9001"
+      - "traefik.http.services.api.loadbalancer.server.port=9501"
+      - "traefik.tcp.routers.grpc.entrypoints=grpc"
+      - "traefik.tcp.routers.grpc.rule=HostSNI(`localhost`) || HostSNI(`127.0.0.1`)"
+      - "traefik.tcp.routers.grpc.tls=true"
+      - "traefik.tcp.routers.grpc.service=api"
+    container_name: dev-runtime
     volumes:
-      - .:/app
+      - ..:/app
     build:
       args:
         KAFKA_ENABLED: "1"
-      context: .
+      context: ..
       dockerfile: Dockerfile
     entrypoint: "/bin/sh -c 'while true; do sleep 30; done;'"
     depends_on:
@@ -103,6 +121,7 @@ services:
       QUEUE_BROKER: redis
       PHP_IDE_CONFIG: serverName=localhost
       WORKERS: 1
+      GRPC_WORKERS: 1
       DEBUG: 1
       REDIS_HOST: redis
       DB_HOST: postgres

.dev/ssl/localhost.crt

@@ -0,0 +1,83 @@
+-----BEGIN CERTIFICATE-----
+MIIEFzCCA52gAwIBAgIURfvF11Q9R3Ue38Tr0BzIoUe0TKQwCgYIKoZIzj0EAwMw
+MDEuMCwGA1UEAxMlU2l0ZXdvcnggSW50ZXJtZWRpYXRlIEVDMzg0IEF1dGhvcml0
+eTAeFw0yNTEyMDQxNjM1NTFaFw0yNjEyMDQxNjM2MjFaMHExCzAJBgNVBAYTAlVT
+MREwDwYDVQQIEwhWaXJnaW5pYTEVMBMGA1UEBxMMUHVyY2VsbHZpbGxlMSQwIgYD
+VQQKExtTaXRld29yeCBQcm9mZXNzaW9uYWxzLCBMTEMxEjAQBgNVBAMTCWxvY2Fs
+aG9zdDB2MBAGByqGSM49AgEGBSuBBAAiA2IABM+jXangYCOi01IMblAXJ6iFZE4v
+SBBOZKNQCwGz8kKi5jyXtVwz6U26DMlBSK+InhhOFQlCRcP9ow8LtlQdaY2XnGKr
+3X3zxdUZJVhLi/wog+I4igU3+xuyn1E/BgEZx6OCAjUwggIxMA4GA1UdDwEB/wQE
+AwIHgDATBgNVHSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW
+BBRAtanjiWMYAdpCCz0rEkyqf691bzAfBgNVHSMEGDAWgBQYBC15lPoGGGxbmwqY
+MWL7jjI6azBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAGGLWh0dHBzOi8vdmF1
+bHQuc2l0ZXdvcnhwcm8uY29tL3YxL3N3eF9pbnQvb2NzcDAaBgNVHREEEzARggls
+b2NhbGhvc3SHBH8AAAEwHAYDVR0gBBUwEzAIBgZngQwBAgIwBwYFZ4EMAQEwggE1
+BgNVHR8EggEsMIIBKDBioGCgXoZcaHR0cHM6Ly92YXVsdC5zaXRld29yeHByby5j
+b20vdjEvc3d4X2ludC9pc3N1ZXIvMjVmMWRiNTAtZDQxOS1kZWQ3LTZiZjktZWNh
+Y2E4NGEwMmY0L2NybC9wZW0wXqBcoFqGWGh0dHBzOi8vdmF1bHQuc2l0ZXdvcnhw
+cm8uY29tL3YxL3N3eF9pbnQvaXNzdWVyLzI1ZjFkYjUwLWQ0MTktZGVkNy02YmY5
+LWVjYWNhODRhMDJmNC9jcmwwYqBgoF6GXGh0dHBzOi8vdmF1bHQuc2l0ZXdvcnhw
+cm8uY29tL3YxL3N3eF9pbnQvaXNzdWVyLzI1ZjFkYjUwLWQ0MTktZGVkNy02YmY5
+LWVjYWNhODRhMDJmNC9jcmwvZGVyMAoGCCqGSM49BAMDA2gAMGUCMGxgZmKITQFu
+H6j3j/t9MOTxhVsfOuoD0q3pMlp9d1u4Lg0THKUOzN06BVuXwC1eagIxAL2I/2a1
+MMJmhky2EavzOsYt37Ae+1KGyELiwcWe5f/lActlw97pqRajpmqEmdo7PA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEETCCAfmgAwIBAgIUIRpRFzFBITweYJETytgbPBgwbWgwDQYJKoZIhvcNAQEL
+BQAwgZ0xCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhWaXJnaW5pYTEVMBMGA1UEBwwM
+UHVyY2VsbHZpbGxlMSQwIgYDVQQKDBtTaXRld29yeCBQcm9mZXNzaW9uYWxzLCBM
+TEMxFDASBgNVBAMMC1NXWCBSb290IENBMSgwJgYJKoZIhvcNAQkBFhl3ZWJtYXN0
+ZXJAc2l0ZXdvcnhwcm8uY29tMB4XDTIzMDMyMTE2MzAxNVoXDTMzMDMxODE2MzA0
+NVowMDEuMCwGA1UEAxMlU2l0ZXdvcnggSW50ZXJtZWRpYXRlIEVDMzg0IEF1dGhv
+cml0eTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIhlP1W1O1WjoDFGFi5XbE0zVy90
+76pQQ8VmSYtaZI9Jz5pAZTOQ073t/QkTWge8uhDaJ2J2uBhjQJGr5BPttvBcLJFI
+52X7hJuck4oL0aukXiHYA5gZbC5LhKVvCyZcWqNjMGEwDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFBgELXmU+gYYbFubCpgxYvuOMjpr
+MB8GA1UdIwQYMBaAFHWCysIFrdsWYZJSjBO1pSQPETkTMA0GCSqGSIb3DQEBCwUA
+A4ICAQBbw5roegt0tUc+gu0IcHDt56cUoqChmIZXzla8gTgg820ww/+Wm+vNAl8W
+r3Y67LzK19CygoujD2o7M25syaByRiw9JdIfNGvBzklOOM+sus9DDmwSUBMCuljS
+KLBhWzIrXDZwemzklGEbj+RL4o2ZiL01nx8xygDF55eaudNS0VzRzd2Hv0C+rm2i
+nnwRNoKsL14YXc41rFBWwb5ViRuD2Wp0c9CivEOd4UNKgOnGyNxcNhjzNlY05t3c
+NEeskEXiz21sj0vnrwM7olKyXPXDFUCCKGb21Sn9sWKldicumU1i1HdDGA1w50uh
+NS4G4wqGQ8iZCq3h6JkpBMGPJPG3Dq6yuzrh8fmh56IqtKY4MxdKHb91MtFHnkw5
+jCrxqpTKShRyqcBSx8QmXRXpec5FEB88NQ3aKhtFlNqXYphNRAI9bLIyGkdxUF/r
+PCkZkKBhbsRvXT8Ii/K1PQHzliQqJxXhrrJEsIg2jiSQItBg52ZySzuw+Y6++h11
+73XMKJ53oOeLcxvp2qJRwMkNTwVfNxDmKC0tIRdI+KoJYbYeN0Ev/pEdPdYl+hjY
+uQhKMt1KtpUyYwPzTGPKGMnklKj/T3Qu7fmpsWxtAOuK7yLLMayBwXBlVBD23md+
+UAfPR3FfVX+aRqqsvT7WI+SnlycJuYXs41ZPxBjLq2aB7fhAwQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGIjCCBAqgAwIBAgIJAKU+Idu5bncNMA0GCSqGSIb3DQEBCwUAMIGdMQswCQYD
+VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExFTATBgNVBAcMDFB1cmNlbGx2aWxs
+ZTEkMCIGA1UECgwbU2l0ZXdvcnggUHJvZmVzc2lvbmFscywgTExDMRQwEgYDVQQD
+DAtTV1ggUm9vdCBDQTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQHNpdGV3b3J4
+cHJvLmNvbTAeFw0yMDA5MDgxMjU3NTJaFw00MDA5MDMxMjU3NTJaMIGdMQswCQYD
+VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExFTATBgNVBAcMDFB1cmNlbGx2aWxs
+ZTEkMCIGA1UECgwbU2l0ZXdvcnggUHJvZmVzc2lvbmFscywgTExDMRQwEgYDVQQD
+DAtTV1ggUm9vdCBDQTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQHNpdGV3b3J4
+cHJvLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN9JNyWot7VX
+ODvru8S5/o6gdFuynA1l5T0uXSzWhROMYHndmY+n7pwQCwf1R8iLL3aat9sDRxqM
+RRScD3nNW6UzC5xNz12wiuemf2KT82cTjmUBU3CvtjstbgkrQ/SrpR/Arvu2YwUe
+tmL9ft/xaoGvZXx8LKpyRMrHA1FlS2st+RFWBC0yXTU/nL4/7YQKVEcbc3YZvgCT
+P4/8pxH9u8W7kgnufQHHKEIZR9lxIUhQ7yvc61B3zMntbJsZV1N+0c7j5DXY5cfT
+6zXlfG2hSX1dbhM56y8O8KiCFaWaDRZ9mwkfZGM0W58gkhXUPXOrIOwewLmvl2Z4
+Vu43UkLfKhtQApxk6zodHRq1e2rNWSpBCGznT9XyoeO/spJ7yggNkleTa+SnnlmV
+rHJS/YUp3/jAvJY2bCHQKFu/mguMY3Ub2X6eEBsVZOmUqDMbya1TPP6GCVqh4gUu
+yip6qS9UksaTF6IN3IcrGhwtTyvp8BFqwVA0tMhgraf1rv6ZoXjY/NDuGjE1xXJg
+Hg+gg2pIIRcXjcsG1tXFXTgxDqoh127ADg/gtq9cIyarMx4LdNTjnR+CnhjqvRkT
+uiUBB1bwDc9pbX0ulfnR+VuIZtQ6PSuWwChnMdNBKmCgQT1J1AHWpQqnFTjg42NV
+5QAdFOQxAnsq2DxkurVFEz2J3euZx1ZdAgMBAAGjYzBhMB0GA1UdDgQWBBR1gsrC
+Ba3bFmGSUowTtaUkDxE5EzAfBgNVHSMEGDAWgBR1gsrCBa3bFmGSUowTtaUkDxE5
+EzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAgEAZDjIlaAoMfRGdb3/i40s6nN18iWN2Chttd8dLXgV+/SZ8GrAU89JNJrK
+ODaLZT1wHeWVz0LP3miByuvfrnH4qzPEOI2L6zEy/FJr8SCivjm7aUExyb5kTSXp
+LkwVcOI9UfQb6lCy9Gs/rUEcWQjs5KS3dy6ZwBMaywq6sRj7MeXmhqXhj7aAyWFA
+psnQsuP2XweWa9OX6Z+u78sebfoiJlOEUvV9VRNHQYpLUd75p6sti1Dm9blWkZEO
+hyssi3kOJMH+g5pc9xNbD9gS+/pFUWxEVAhHOc0xdEIcHfV5oiiOUDD5EOIPi3xv
+/NYTV7o7pv2/QlH09vO2PHdsy07lhsg7NoM3U+zYq609Ox78/b4PNd+TkdtYKebO
+VumZ0xXab0lWbTVuno52k473ODQRA/v9YWHtuovW0Lzf5fDcBhVXTDeW21SmMJIx
+B+dgJDh7ql7ruZqjMj+kePjM9Mm+M5pDZ6vrEtgiR2yQj/IE+LoQh/bxFHpFkIK8
+I6AWoxABAvLZB+KHl1ufR5yOauJG2+SQRuzHNZvkAcdjmwpgfxcsB2mY7o0RbGmZ
+VWm97P4P9iJhje/W4C0cGwVY5wRAMAg6SI1BpcW7YghB14UrKaxpEzHCdZIeeT94
+GYzN2XNSSGW3s1anFedd5PQyRM7PlJIcloLYrqyWW6M7OwWnMXA=
+-----END CERTIFICATE-----

.dev/ssl/localhost.key

@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBrpJYaCMqgu490fpZoIphGVspE33v3JwyD9B55HwSX/jykySs9NTOv
+68YndzE9LNCgBwYFK4EEACKhZANiAATPo12p4GAjotNSDG5QFyeohWROL0gQTmSj
+UAsBs/JCouY8l7VcM+lNugzJQUiviJ4YThUJQkXD/aMPC7ZUHWmNl5xiq91988XV
+GSVYS4v8KIPiOIoFN/sbsp9RPwYBGcc=
+-----END EC PRIVATE KEY-----

.dev/ssl/traefik.yml

@@ -0,0 +1,14 @@
+tls:
+  stores:
+    default:
+      defaultCertificate:
+        certFile: /etc/ssl/localhost.crt
+        keyFile: /etc/ssl/localhost.key
+
+  options:
+    default:
+      minVersion: VersionTLS13
+      preferServerCipherSuites: true
+
+    mintls13:
+      minVersion: VersionTLS13

.rr.yaml

@@ -11,12 +11,9 @@ grpc:
   pool:
     command: "php grpc-worker.php"
     num_workers: ${GRPC_WORKERS:-4}
-    allocate_timeout: 5s
+    debug: ${DEBUG:-false}
-    reset_timeout: 5s
-    destroy_timeout: 5s
-    stream_timeout: 5s
     reflection: ${GRPC_REFLECTION:-true}
-    health_check: ${GRPC_HEALTH_CHECK:-true}
+    destroy_timeout: 5s
   proto:
     - "protos/example.proto"
 

.run/ Compose Deployment.run.xml

@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name=" Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+  <configuration default="false" name=".dev: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
-        <option name="sourceFilePath" value="docker-compose.yml" />
+        <option name="sourceFilePath" value=".dev/docker-compose.yml" />
       </settings>
     </deployment>
     <method v="2" />

Dockerfile

@@ -26,6 +26,7 @@ RUN if [ "$KAFKA_ENABLED" -eq 1 ] ; then \
         echo "Kafka support enabled" ; \
         apk add autoconf g++ librdkafka-dev make --no-cache ; \
         pecl install rdkafka && docker-php-ext-enable rdkafka ; \
+        apk del autoconf g++ make ; \
     else \
         echo "Kafka support disabled" ; \
         exit 0 ; \
@@ -43,11 +44,17 @@ COPY --from=library /app/vendor /app/vendor
 # Copy the RoadRunner configuration file and source
 ADD src src/
 ADD generated generated/
-ADD server.php .
+ADD protos protos/
-ADD .rr.yaml .
+ADD server.php cli.php grpc-worker.php .rr.yaml config.php ./
-ADD config.php .
 
-EXPOSE 9501
+EXPOSE 9501 9001
+
+RUN addgroup -g 1000 appuser && adduser -D -u 1000 -G appuser appuser && chown -R appuser:appuser /app
+USER appuser
+
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s \
+  CMD curl -f http://localhost:9501/healthz || exit 1
 
 # Entrypoint command to run the RoadRunner server with the specified configuration
-ENTRYPOINT ["rr",  "serve",  "-c",  ".rr.yaml", "-s"]
+ENTRYPOINT ["rr", "serve"]
+CMD ["-c", ".rr.yaml", "-s"]

README.md

@@ -2,55 +2,132 @@
 
 ![pipeline status](https://gitea.siteworxpro.com/siteworxpro/Php-Template/actions/workflows/tests.yml/badge.svg?branch=master&style=flat-square)
 
+## Overview
+
+This is a PHP project template that provides a structured development environment using Docker Compose and Make.
+It includes tools for code quality, testing, dependency management, and gRPC support.
+
 ## Dev Environment
 
-### Prerequisites
+This project uses Docker Compose and Make to manage the development environment. The `makefile` provides convenient
-- Docker
+commands for common development tasks.
-- Docker Compose
 
-### migrations
+## Prerequisites
 
-create a new migration
+- Docker and Docker Compose
-```shell
+- Make
-docker run --rm  -v $(PWD):/app siteworxpro/migrate:v4.18.3 create -ext sql -dir /app/db/migrations -seq create_users_table
+- protoc (Protocol Buffers compiler) - for gRPC code generation
+
+## Quick Start
+
+```bash
+# Install PHP dependencies
+make composer-install
+
+# Start the development container
+make start
+
+# Run the application server
+make run
 ```
 
-```text
+## Available Commands
-postgres://siteworxpro:password@localhost:5432/siteworxpro?sslmode=disable
+
+### Container Management
+
+- `make start` - Start the development runtime container
+- `make stop` - Stop and remove all containers
+- `make restart` - Restart the development container
+- `make rebuild` - Rebuild containers (use after Dockerfile changes)
+- `make sh` - Open a shell in the development container
+- `make ps` - Show running containers
+
+### Application
+
+- `make run` - Run the application server (RoadRunner)
+- `make migrate` - Run database migrations
+
+### Composer & Dependencies
+
+- `make composer-install` - Install PHP dependencies
+- `make composer-update` - Update PHP dependencies
+- `make composer-require package=vendor/package` - Add a new dependency
+- `make composer-require-dev package=vendor/package` - Add a new dev dependency
+
+### Code Quality
+
+- `make lint` - Run linters (phpcs and phpstan)
+- `make fmt` - Format code with php-cs-fixer
+- `make test` - Run the test suite (phpunit)
+- `make license-check` - Check license headers in source files
+
+### Debugging & Coverage
+
+- `make enable-debug` - Enable Xdebug for debugging
+- `make enable-coverage` - Enable PCOV for code coverage
+
+### gRPC
+
+- `make protoc` - Generate PHP gRPC code from `.proto` files
+
+### CI Workflow
+
+- `make ci` - Run the full CI pipeline locally (install, license check, lint, test)
+
+### Help
+
+- `make help` - Show all available commands with descriptions
+
+## Common Workflows
+
+### Starting Development
+
+```bash
+make composer-install
+make start
+make run
 ```
 
-```shell
+### Adding a New Package
-docker run --rm  -v $(PWD):/app siteworxpro/migrate:v4.18.3 -database "postgres://siteworxpro:password@localhost:5432/siteworxpro?sslmode=disable" -path /app/db/migrations up
+
+```bash
+make composer-require package=vendor/package-name
 ```
 
-### Starting the Runtime
+### Running Tests
-```shell
+
-docker-compose up -d
+```bash
-```
+make test
-### Start the server
-```shell
-docker exec -it template-dev-runtime-1 rr serve
 ```
 
-You can access the api at `http://localhost:9501/`
+### Code Quality Check
 
-### Xdebug
+```bash
-
+make lint
-xdebug needs to be built into the container before it will work
+make fmt
-```shell
- docker exec -it php-template-composer-runtime-1 bin/xdebug.sh
 ```
 
-### Install the dependencies
+### Debugging
-```shell
+
-docker run --rm  -v $(PWD):/app siteworxpro/composer install --ignore-platform-reqs
+```bash
+make enable-debug
+make run
 ```
 
-### Running all tests
+## Notes
-```shell
-docker run --rm  -v $(PWD):/app siteworxpro/composer run tests:all
-```
 
+- All commands run inside Docker containers, ensuring a consistent environment
+- The development runtime uses RoadRunner as the application server
+- Composer commands run in a separate `composer-runtime` container
+- Database migrations run in a dedicated `migration-container`
+
+## Additional Information
+
+### Accessing Services
+
+- You can access the api at [https://localhost](https://localhost)
+- Traefik dashboard is at [https://127.0.0.1/dashboard/](https://127.0.0.1/dashboard/)
+- the grpc server is at [tcp://localhost:9001](tcp://localhost:9001)
 
 ## License
 

config.php

@@ -14,7 +14,6 @@ return [
      */
     'server' => [
         'port' => Env::get('HTTP_PORT', 9501, 'int'),
-        'dev_mode' => Env::get('DEV_MODE', false, 'bool'),
     ],
 
     /**

grpc-worker.php

@@ -6,7 +6,7 @@ require __DIR__ . '/vendor/autoload.php';
 
 try {
     $server = new Grpc();
-    $server->start();
+    exit($server->start());
 } catch (\Exception $e) {
     echo $e->getMessage();
 

makefile

@@ -2,8 +2,11 @@
 SHELL := /bin/sh
 .DEFAULT_GOAL := help
 
+# Docker Compose file
+COMPOSE_FILE := -f .dev/docker-compose.yml
+
 # Reusable vars
-DOCKER := docker compose
+DOCKER := docker compose $(COMPOSE_FILE)
 COMPOSER_RUNTIME := composer-runtime
 DEV_RUNTIME := dev-runtime
 MIGRATION_CONTAINER := migration-container
@@ -12,24 +15,36 @@ PROTOC_GEN_DIR := ./protoc-gen-php-grpc-2025.1.5-darwin-arm64
 PROTOC_GEN := $(PROTOC_GEN_DIR)/protoc-gen-php-grpc
 PROTOC_URL := https://github.com/roadrunner-server/roadrunner/releases/download/v2025.1.5/protoc-gen-php-grpc-2025.1.5-darwin-arm64.tar.gz
 
-COMPOSER := $(DOCKER) exec $(COMPOSER_RUNTIME) sh -c
 DEV := $(DOCKER) exec $(DEV_RUNTIME) sh -c
+COMPOSER := $(DOCKER) exec $(COMPOSER_RUNTIME) sh -c
 
 # Colors
 GREEN := \033[32m
 YELLOW := \033[33m
 RESET := \033[0m
 
+# Fancy emoji
+SPARK := ✨
+ROCKET := 🚀
+WARN := ⚠️
+MAGNIFY := 🔍
+BUG := 🐞
+COMPOSE := 🐳
+TRASH := 🧹
+PROTO := 🧩
+CHECK := ✅
+CROSS := ❌
+
 # Align width for help display
 HELP_COL_WIDTH := 26
 
 # Help: auto-generate from targets with "##" comments
 help: ## Show this help
-	@echo "Available commands:"
+	@echo "$(SPARK) Available commands:"
 	@awk -F':|##' '/^[a-zA-Z0-9._-]+:.*##/ {printf "  %-$(HELP_COL_WIDTH)s - %s\n", $$1, $$3}' $(MAKEFILE_LIST) | sort
 
 start: ## Start the development runtime container
-	@printf "$(GREEN)Starting $(DEV_RUNTIME)$(RESET)\n"
+	@printf "$(GREEN)$(ROCKET) Starting $(DEV_RUNTIME)$(RESET)\n"
 	$(DOCKER)  up $(DEV_RUNTIME) -d --no-recreate
 
 sh: ## Open a shell in the development runtime container
@@ -41,7 +56,7 @@ run: ## Run the application server in the development runtime container
 	$(DEV) "rr serve"
 
 stop: ## Stop and remove the development runtime container
-	@printf "$(YELLOW)Stopping all containers$(RESET)\n"
+	@printf "$(YELLOW)$(WARN) Stopping all containers$(RESET)\n"
 	$(DOCKER) down
 
 restart: ## Restart dev container (stop + start)
@@ -49,9 +64,11 @@ restart: ## Restart dev container (stop + start)
 	@$(MAKE) start
 
 rebuild: ## Rebuild containers (useful after Dockerfile changes)
-	@printf "$(YELLOW)Rebuilding containers$(RESET)\n"
+	@printf "$(YELLOW)$(SPARK) Rebuilding containers$(RESET)\n"
-	$(DOCKER) build
+	@$(MAKE) stop
-	$(DOCKER) up --force-recreate --build -d
+	@printf "$(YELLOW)$(TRASH) Deleting all Docker resources$(RESET)\n"
+	docker system prune --all --volumes --force
+	@$(MAKE) start
 
 ps: ## Show docker compose ps
 	$(DOCKER) ps
@@ -61,60 +78,85 @@ migrate: ## Run database migrations in the migration container
 
 # Composer helpers
 composer-install: ## Install PHP dependencies in the composer runtime container
+	@printf "$(COMPOSE) $(GREEN)Installing PHP dependencies in $(COMPOSER_RUNTIME)$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "composer install --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs"
 
 composer-require: ## Require a PHP package in the composer runtime container (usage: make composer-require package=vendor/package)
 ifndef package
 	$(error package variable is required: make composer-require package=vendor/package)
 endif
+	@printf "$(COMPOSE) $(MAGNIFY) Requiring package $(package) in $(COMPOSER_RUNTIME)$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "composer require $(package) --ignore-platform-reqs"
 
 composer-require-dev: ## Require a PHP package as dev in the composer runtime container (usage: make composer-require-dev package=vendor/package)
 ifndef package
 	$(error package variable is required: make composer-require-dev package=vendor/package)
 endif
+	@printf "$(COMPOSE) $(MAGNIFY) Requiring dev package $(package) in $(COMPOSER_RUNTIME)$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "composer require --dev $(package) --ignore-platform-reqs"
 
 composer-update: ## Update PHP dependencies in the composer runtime container
+	@printf "$(COMPOSE) $(MAGNIFY) Updating PHP dependencies$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "composer update --no-interaction --prefer-dist --optimize-autoloader --ignore-platform-reqs"
 
 enable-debug: ## Enable Xdebug in the development runtime container
-	@$(MAKE) start
+	@$(DOCKER) up $(DEV_RUNTIME) -d --no-recreate
+	@printf "$(GREEN)$(BUG) Enabling Xdebug in $(DEV_RUNTIME)$(RESET)\n"
 	$(DEV) "bin/xdebug.sh"
 
 enable-coverage: ## Enable PCOV code coverage in the composer runtime container
-	@$(MAKE) start
+	@printf "$(GREEN)$(MAGNIFY) Enabling PCOV in $(COMPOSER_RUNTIME)$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "bin/pcov.sh"
 
 protoc: ## Generate PHP gRPC code from .proto files
-	@printf "$(GREEN)Setting up protoc-gen-php-grpc plugin$(RESET)\n"
+	@printf "$(PROTO) $(GREEN)Setting up protoc-gen-php-grpc plugin$(RESET)\n"
 	@curl -LOs $(PROTOC_URL)
 	@tar -xzf protoc-gen-php-grpc-2025.1.5-darwin-arm64.tar.gz
-	@printf "$(GREEN)Generating PHP gRPC code from .proto files$(RESET)\n"
+	@printf "$(PROTO) $(GREEN)Generating PHP gRPC code from .proto files$(RESET)\n"
 	@protoc --plugin=./protoc-gen-php-grpc-2025.1.5-darwin-arm64/protoc-gen-php-grpc \
 	       --php_out=./generated \
 	       --php-grpc_out=./generated \
 	       protos/example.proto
-	@printf "$(GREEN)Cleaning up protoc-gen-php-grpc plugin files$(RESET)\n"
+	@printf "$(TRASH) $(GREEN)Cleaning up protoc-gen-php-grpc plugin files$(RESET)\n"
 	@rm -rf $(PROTOC_GEN_DIR) protoc-gen-php-grpc-2025.1.5-darwin-arm64.tar.gz
 
+license-check: ## Check license headers in source files
+	@printf "$(MAGNIFY) $(GREEN)Checking license headers$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
+	$(COMPOSER) "composer run-script tests:license || true"
+
 # Developer tasks
 lint: ## Run linting (phpcs/phpstan) in composer runtime
+	@printf "$(MAGNIFY) $(GREEN)Running linters$(RESET)\n"
 	@$(DOCKER) up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "composer run-script tests:lint || true"
 	$(COMPOSER) "composer run-script tests:phpstan || true"
 
 fmt: ## Format code (php-cs-fixer)
+	@printf "$(MAGNIFY) $(GREEN)Formatting code$(RESET)\n"
 	@$(DOCKER)  up $(COMPOSER_RUNTIME) -d --no-recreate
 	$(COMPOSER) "composer run-script tests:lint:fix"
 
 test: ## Run test suite (phpunit)
+	@printf "$(CHECK) $(GREEN)Running unit tests$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d
 	$(COMPOSER) "composer run-script tests:unit || true"
 
+test-coverage: ## Run test suite with coverage report
+	@printf "$(CHECK) $(GREEN)Running unit tests with coverage report$(RESET)\n"
+	@$(DOCKER) up $(COMPOSER_RUNTIME) -d
+	@$(MAKE) enable-coverage
+	$(COMPOSER) "composer run-script tests:unit:coverage || true"
+
 # Convenience aliases
 dev: run ## Alias for start
-ci: composer-install test ## CI-like local flow
+ci: composer-install migrate license-check lint test ## CI-like local flow
 down: stop ## Alias for stop
 up: start ## Alias for start
 
-.PHONY: help start sh run stop restart rebuild ps logs migrate composer-install composer-require composer-require-dev composer-update enable-debug enable-coverage protoc lint fmt test check-lock dev ci
+.PONY: help start sh run stop restart rebuild ps migrate composer-install composer-require composer-require-dev composer-update enable-debug enable-coverage protoc license-check lint fmt test test-coverage dev ci down up

src/Grpc.php

@@ -20,6 +20,10 @@ use Spiral\RoadRunner\Worker;
  */
 class Grpc
 {
+    private const array SERVICES = [
+        GreeterInterface::class => GreeterHandler::class,
+    ];
+
     /**
      * @throws \ReflectionException
      */
@@ -36,10 +40,13 @@ class Grpc
     public function start(): int
     {
         $server = new Server(new Invoker(), [
-            'debug' => (bool) Config::get('app.debug'),
+            'debug' => Config::get('app.dev_mode'),
         ]);
 
-        $server->registerService(GreeterInterface::class, new GreeterHandler());
+        foreach (self::SERVICES as $interface => $handler) {
+            $server->registerService($interface, new $handler());
+        }
+
         $server->serve(Worker::create());
 
         return 0;