ci: Upgraded docker compose dev environment

Author: ambroisemaupate

.env

@@ -61,15 +61,6 @@ HOSTNAME_PMA=`pma.roadiz-skeleton.test`,`pma.roadiz-skeleton.local`
 HOSTNAME_SOLR=`solr.roadiz-skeleton.test`,`solr.roadiz-skeleton.local`
 HOSTNAME_MAILER=`mail.roadiz-skeleton.test`,`mail.roadiz-skeleton.local`
 
-# MySQL env vars for DOCKER
-MYSQL_ROOT_PASSWORD=root
-MYSQL_HOST=db
-MYSQL_PORT=3306
-MYSQL_DATABASE=roadiz
-MYSQL_USER=roadiz
-MYSQL_PASSWORD=roadiz
-MYSQL_VERSION=8.0
-
 ###> symfony/lock ###
 # Choose one of the stores below
 # postgresql+advisory://db_user:db_password@localhost/db_name

README.md

@@ -85,36 +85,6 @@ services:
     #        - "${PUBLIC_SOLR_PORT}:8983/tcp"
 ```
 
-#### Or use `symfony server:start` instead of Docker
-
-If you are working on a *macOS* environment, you may prefer using `symfony` binary to start a local webserver instead of using
-a full _Docker_ stack. You will need to install `symfony` binary first:
-
-```shell
-curl -sS https://get.symfony.com/cli/installer | bash
-```
-
-And make sure your local PHP environment is configured with php-intl, php-redis, php-gd extensions.
-You will need to use at least *MySQL* and *Redis* (and *Solr* if needed) services from Docker stack in order to run your application.
-
-```shell
-docker compose -f docker-compose.symfony.yml up -d 
-```
-
-- Configure your `.env.local` variables to use your local MySQL and Redis services. Replacing `db`, `redis`, `mailer` and `solr` hostnames with `127.0.0.1`. Make sure to use `127.0.0.1` and not `localhost` on *macOS* as it will not work with Docker.
-- Remove `docker compose exec -u www-data app ` prefix from all commands in `Makefile` to execute recipes locally.
-- Remove cache invalidation Varnish configuration from `config/packages/api_platform.yaml` and `config/packages/roadiz_core.yaml` file.
-
-Then you can start your local webserver:
-
-```shell
-symfony serve -d
-```
-
-Perform all installation steps described above, without using `docker compose exec` command.
-
-Then your Roadiz backoffice will be available at `https://127.0.0.1:8000/rz-admin`
-
 ### Generate [Symfony secrets](https://symfony.com/doc/current/configuration/secrets.html)
 
 When you run `composer create-project` first time, following command should have been executed automatically:

compose.prod.yml

@@ -245,4 +245,4 @@ networks:
         ipam:
             driver: default
             config:
-                -   subnet: ${DEFAULT_GATEWAY}/16
+                -   subnet: ${DEFAULT_GATEWAY}/24

compose.symfony.yml

@@ -1,6 +1,7 @@
 name: ${APP_NAMESPACE}
 services:
     db:
+        hostname: db
         build:
             # Custom image for file permissions
             context: ./docker/mysql
@@ -9,30 +10,28 @@ services:
         cap_add:
             - SYS_NICE  # CAP_SYS_NICE
         networks:
-            default:
+            - default
         volumes:
             - "./.data/db:/var/lib/mysql:delegated"
             - "./docker/mysql/performances.cnf:/etc/mysql/conf.d/performances.cnf"
         environment:
-            MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-            MYSQL_DATABASE: ${MYSQL_DATABASE}
-            MYSQL_USER: ${MYSQL_USER}
-            MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+            MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
+            MYSQL_DATABASE: ${MYSQL_DATABASE:-roadiz}
+            MYSQL_USER: ${MYSQL_USER:-roadiz}
+            MYSQL_PASSWORD: ${MYSQL_PASSWORD:-roadiz}
 
     pma:
-        image: phpmyadmin/phpmyadmin
+        image: phpmyadmin:5.2.1
         environment:
-            MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-            MYSQL_DATABASE: ${MYSQL_DATABASE}
-            MYSQL_USER: ${MYSQL_USER}
-            MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-            MYSQL_HOST: ${MYSQL_HOST}
-            MYSQL_PORT: ${MYSQL_PORT}
+            PMA_HOST: ${MYSQL_HOST:-db}
+            UPLOAD_LIMIT: 64M
+            PMA_USER: ${MYSQL_USER:-roadiz}
+            PMA_PASSWORD: ${MYSQL_PASSWORD:-roadiz}
+        depends_on:
+            - db
         networks:
-            frontproxynet:
-                aliases:
-                    - ${APP_NAMESPACE}_pma
-            default:
+            - frontproxynet
+            - default
         labels:
             - "traefik.enable=true"
             - "traefik.http.services.${APP_NAMESPACE}_pma.loadbalancer.server.scheme=http"
@@ -49,6 +48,8 @@ services:
             - "traefik.http.routers.${APP_NAMESPACE}_pma_secure.service=${APP_NAMESPACE}_pma"
 
     app: &app_template
+        # Nginx does not resolve `app` hostname correctly
+        hostname: app
         # Need to pass all vars to docker env for Crontab and supervisor scripts
         #env_file: "./.env.local"
         build:
@@ -67,19 +68,11 @@ services:
             TRUSTED_PROXIES: ${TRUSTED_PROXIES}
             USER_UID: ${USER_UID}
             DEFAULT_GATEWAY: ${DEFAULT_GATEWAY}
-            MYSQL_HOST: ${MYSQL_HOST}
-            MYSQL_PORT: ${MYSQL_PORT}
-            APP_ENV: dev
-            APP_RUNTIME_ENV: dev
-            APP_DEBUG: 1
 
     nginx:
         image: roadiz/nginx-alpine:latest
         depends_on:
             - app
-        # Nginx does not resolve `app` hostname correctly
-        links:
-            - app:app
         volumes:
             - ./:/var/www/html:cached
         networks:
@@ -111,6 +104,7 @@ services:
 
     worker:
         <<: *app_template
+        hostname: worker
         deploy:
             # Do not use more than 1 replica if you're using Varnish and need to purge/ban cache
             # from your workers. Varnish ACL hostnames won't be resolved correctly.
@@ -120,6 +114,7 @@ services:
 
     cron:
         <<: *app_template
+        hostname: cron
         entrypoint: 'docker-cron-entrypoint'
         restart: unless-stopped
         user: root
@@ -159,12 +154,11 @@ services:
 #            - "traefik.http.routers.${APP_NAMESPACE}_solr_secure.service=${APP_NAMESPACE}_solr"
 
     mailer:
+        hostname: mailer
         image: axllent/mailpit
         networks:
-            frontproxynet:
-                aliases:
-                    - ${APP_NAMESPACE}_mailer
-            default:
+            - frontproxynet
+            - default
         labels:
             - "traefik.enable=true"
             - "traefik.http.services.${APP_NAMESPACE}_mailer.loadbalancer.server.scheme=http"
@@ -182,6 +176,7 @@ services:
 
     # Use Redis for Cache, Messaging and Sessions
     redis:
+        hostname: redis
         image: redis:7-alpine
         networks:
             - default
@@ -198,10 +193,8 @@ services:
             - cron:cron
             - worker:worker
         networks:
-            frontproxynet:
-                aliases:
-                    - ${APP_NAMESPACE}_varnish
-            default:
+            - frontproxynet
+            - default
         environment:
             VARNISH_SIZE: ${VARNISH_SIZE}
         labels:
@@ -235,7 +228,7 @@ networks:
         ipam:
             driver: default
             config:
-                -   subnet: ${DEFAULT_GATEWAY}/16
+                -   subnet: ${DEFAULT_GATEWAY}/24
 
 volumes:
     solr_data:

compose.yml

@@ -7,8 +7,6 @@ ENV APP_ENV=dev
 ENV APP_RUNTIME_ENV=dev
 ENV APP_DEBUG=1
 ENV APP_FFMPEG_PATH=/usr/bin/ffmpeg
-ENV MYSQL_HOST=db
-ENV MYSQL_PORT=3306
 
 HEALTHCHECK --start-period=30s --interval=1m --timeout=6s CMD bin/console monitor:health -q
 

docker/php-fpm-alpine/Dockerfile

@@ -6,24 +6,6 @@ echo "APP_ENV=${APP_ENV}";
 echo "APP_RUNTIME_ENV=${APP_RUNTIME_ENV}";
 echo "APP_DEBUG=${APP_DEBUG}";
 
-#
-# Override default entrypoint to add some maintenance DEV only.
-# DO NOT CALL THIS SCRIPT FOR WORKERS AND CRON containers (see docker-compose.yml)
-#
-
-# Print local env vars to .env.xxx.php file for performances and crontab jobs
-/var/www/html/bin/console assets:install -n
-/var/www/html/bin/console themes:assets:install -n Rozier --relative --symlink
-
-#
-# Wait for database to be ready for next commands and migrations
-#
-/wait-for-it.sh -t 0 -s ${MYSQL_HOST}:${MYSQL_PORT}
-
-/var/www/html/bin/console cache:clear -n
-# Clear all cache pool on Symfony 5.4 https://symfony.com/doc/5.4/cache.html#clearing-the-cache
-/var/www/html/bin/console cache:pool:clear cache.global_clearer -n
-
 # first arg is `-f` or `--some-option`
 if [ "${1#-}" != "$1" ]; then
 	set -- php-fpm "$@"

docker/php-fpm-alpine/docker-php-entrypoint-dev

@@ -1,4 +1,4 @@
-FROM solr:8-slim
+FROM solr:9-slim
 LABEL org.opencontainers.image.authors="ambroise@rezo-zero.com"
 
 ARG USER_UID=8983