docker: upgrade to php8.2, add symfony cli, fix #5

Author: jgauthi

.docker/mysql/Dockerfile

@@ -1,4 +1,5 @@
 FROM mysql:8
+MAINTAINER J.GAUTHI <github.com/jgauthi>
 
 ARG MYSQL_USER
 ARG MYSQL_PASSWORD

.docker/nginx/sites/demo.conf

@@ -2,7 +2,7 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server;
     server_name demo.localhost.tv;
-    root /var/www/demo/public;
+    root /var/www/project/demo/public;
 
     location / {
         try_files $uri @rewriteapp;
@@ -22,8 +22,8 @@ server {
     }
 
     # You can write your logs in symfony log folder
-    # error_log /var/www/demo/var/log/nginx-error.log;
-    # access_log /var/www/demo/var/log/nginx-access.log;
+    # error_log /var/www/project/demo/var/log/nginx-error.log;
+    # access_log /var/www/project/demo/var/log/nginx-access.log;
     error_log /var/log/nginx/demo_error.log;
     access_log /var/log/nginx/demo_access.log;
 }

.docker/php/Dockerfile

@@ -1,11 +1,12 @@
-FROM php:8.1-fpm
+FROM php:8.2-fpm
+MAINTAINER J.GAUTHI <github.com/jgauthi>
 
 # Some libs
 RUN apt-get update && apt-get install -y --no-install-recommends vim curl locales apt-utils unzip
 
 # https://github.com/mlocati/docker-php-extension-installer
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
-RUN install-php-extensions @composer \
+RUN install-php-extensions \
     apcu opcache intl \
     gd \
     pdo_mysql \
@@ -14,6 +15,13 @@ RUN install-php-extensions @composer \
     xdebug \
     zip
 
+# Install composer
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+
+# Install symfony cli
+RUN curl -sS https://get.symfony.com/cli/installer | bash && mv /root/.symfony5/bin/symfony /usr/local/bin/
+RUN chown -R www-data:www-data /var/www
+
 # PHP Conf
 COPY php.ini /usr/local/etc/php/php.ini
 COPY php-fpm-pool.conf /usr/local/etc/php/php-fpm.conf
@@ -23,7 +31,7 @@ RUN rm -rf /var/lib/apt/lists/* \
     && apt-get purge --auto-remove -y g++ \
     && apt-get clean
 
-WORKDIR /var/www/
+WORKDIR /var/www/project/demo
 USER www-data
 
 EXPOSE 9000

.env.dist

@@ -21,19 +21,26 @@ APP_SECRET=1c033cf04c8c84f016ffa88768ee165a
 ###< symfony/framework-bundle ###
 
 ###> doctrine/doctrine-bundle ###
-# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
-# Configure your db driver and server_version in config/packages/doctrine.yaml
-# DATABASE_URL=mysql://local:local@db:3306/demo
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+DB_HOST=db
+DB_PORT=3306
+DB_NAME=demo
+DB_USER=local
+DB_PASS=local
+DATABASE_URL=mysql://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}?serverVersion=8
+TIMEZONE=Europe/Paris
 ###< doctrine/doctrine-bundle ###
 
 ###> Docker config ###
 COMPOSE_PROJECT_NAME=sfdemo
 # VOLUME_USER_ID=1001 # You can set your Linux UserID (command: id -u)
 # COMPOSER_HOME=/home/$user/.cache/composer/  # You can set your composer folder, change $user by your username
+
+# A transférer dans doctrine
 MYSQL_DATABASE=demo
 MYSQL_USER=local
 MYSQL_PASSWORD=local
 MYSQL_PORT=3306
-TIMEZONE=Europe/Paris
 ###< Docker database conf ###

Makefile

@@ -8,11 +8,12 @@ endif
 user := $(shell id -u)
 group := $(shell id www-data -g)
 PROJECT_NAME=demo
-PROJECT_DIR=/var/www/$(PROJECT_NAME)
+PROJECT_DIR=/var/www/project/$(PROJECT_NAME)
 DOCKER_COMPOSE := USER_ID=$(user) GROUP_ID=$(group) docker-compose
 EXEC?=$(DOCKER_COMPOSE) exec --workdir $(PROJECT_DIR) php
+EXEC_SF?=$(DOCKER_COMPOSE) exec -u www-data php
 EXEC_ROOT?=$(DOCKER_COMPOSE) exec --workdir $(PROJECT_DIR) -u root php
-CONSOLE=bin/console
+CONSOLE=$(EXEC_SF) symfony console
 PHPCSFIXER?=$(EXEC) php -d memory_limit=1024m vendor/bin/php-cs-fixer
 DOCKER_COMPOSE_OVERRIDE ?= dev
 
@@ -25,7 +26,7 @@ help:
 ##---------------------------------------------------------------------------
 
 sf: ## Symfony Command, example: `sf CMD="debug:router"`
-	@$(EXEC) $(CONSOLE) $(CMD)
+	@$(CONSOLE) $(CMD)
 
 up: docker-compose.override.yml up-ci  ## Start project with docker-compose + Dev env
 
@@ -44,16 +45,16 @@ install-demo:
 	@$(EXEC_ROOT) chmod -R 775 /var/www
 	@$(EXEC_ROOT) chown -R www-data:www-data /var/www
 	@rm -rf project/* project/.env
-	$(call composer,create-project symfony/symfony-demo install_project,/var/www)
+	$(call composer,create-project symfony/symfony-demo install_project,/var/www/project)
 	@cp .docker/php/symfony-demo.env project/.env
-	@$(EXEC_ROOT) bash -c "cd /var/www && mv install_project/* $(PROJECT_NAME)/ && rm -rf install_project/ data/"
+	@$(EXEC_ROOT) bash -c "cd /var/www/project && mv install_project/* $(PROJECT_NAME)/ && rm -rf install_project/ data/"
 	@make restart perm db-create-migration db-install clear-cache
 
 install-prod:
 	APP_ENV=prod APP_DEBUG=0 $(call composer,install --no-dev --optimize-autoloader)
 	APP_ENV=prod make clear-cache
-	APP_ENV=prod APP_DEBUG=0 @$(EXEC) $(CONSOLE) cache:clear
-	@$(EXEC) $(CONSOLE) cache:pool:clear cache.global_clearer
+	APP_ENV=prod APP_DEBUG=0 @$(CONSOLE) cache:clear
+	@$(CONSOLE) cache:pool:clear cache.global_clearer
 
 status:  ## Docker container status
 	@$(DOCKER_COMPOSE) ps
@@ -64,8 +65,8 @@ uninstall: clear stop  ## Remove docker containers
 reset: uninstall install  ## Remove and re-create docker containers
 
 clear-cache: perm  ## Clear + Prepare Cache (alias: c:c), you can specify the env: ENV=prod
-	@$(EXEC) $(CONSOLE) cache:clear --no-warmup --env=$(APP_ENV)
-	@$(EXEC) $(CONSOLE) cache:warmup --env=$(APP_ENV)
+	@$(CONSOLE) cache:clear --no-warmup --env=$(APP_ENV)
+	@$(CONSOLE) cache:warmup --env=$(APP_ENV)
 
 c\:c: clear-cache
 
@@ -96,32 +97,32 @@ shell:  ## Run app container in interactive mode
 	@$(EXEC) /bin/bash
 
 server-dump:  ## [Dev only] Display dump() values with tail (ctrl+C to stop)
-	@$(EXEC) $(CONSOLE) server:dump
+	@$(CONSOLE) server:dump
 
 
 ##
 ## Doctrine Command (Database)
 ##---------------------------------------------------------------------------
 db-diff:  ## Generate a migration by comparing your current database to your mapping information
-	@$(EXEC) $(CONSOLE) doctrine:migration:diff
+	@$(CONSOLE) doctrine:migration:diff
 
 db-create-migration: ## Create migration
-	@$(EXEC) $(CONSOLE) make:migration
+	@$(CONSOLE) make:migration
 
 db-migrate:  ## Migrate database schema to the latest available version
-	@$(EXEC) $(CONSOLE) doctrine:migration:migrate -n --env=$(APP_ENV)
+	@$(CONSOLE) doctrine:migration:migrate -n --env=$(APP_ENV)
 
 db-rollback:  ## Rollback the latest executed migration
-	@$(EXEC) $(CONSOLE) doctrine:migration:migrate prev -n --env=$(APP_ENV)
+	@$(CONSOLE) doctrine:migration:migrate prev -n --env=$(APP_ENV)
 
 db-validate:  ## Check the ORM mapping
-	@$(EXEC) $(CONSOLE) doctrine:schema:validate
+	@$(CONSOLE) doctrine:schema:validate
 
 db-create-database: ## Create database if not exists
-	@$(EXEC) $(CONSOLE) doctrine:database:create --if-not-exists
+	@$(CONSOLE) doctrine:database:create --if-not-exists
 
 db-fixtures:  ## Apply doctrine fixtures
-	@$(EXEC) $(CONSOLE) doctrine:fixtures:load -n --env=$(APP_ENV)
+	@$(CONSOLE) doctrine:fixtures:load -n --env=$(APP_ENV)
 
 db-install: db-create-database db-migrate db-fixtures ## Drop and install database with schema + fixtures
 
@@ -158,13 +159,13 @@ lint: lint-symfony php-cs  ## Run lint on Twig, YAML, PHP and Javascript files
 lint-symfony: lint-yaml lint-twig lint-xliff  ## Lint Symfony (Twig and YAML) files
 
 lint-yaml:   ## Lint YAML files
-	@$(EXEC) $(CONSOLE) lint:yaml config
+	@$(CONSOLE) lint:yaml config
 
 lint-twig:   ## Lint Twig files
-	@$(EXEC) $(CONSOLE) lint:twig templates
+	@$(CONSOLE) lint:twig templates
 
 lint-xliff:   ## Lint Translation files
-	@$(EXEC) $(CONSOLE) lint:xliff translations
+	@$(CONSOLE) lint:xliff translations
 
 php-cs: vendor  ## Lint PHP code
 	@$(PHPCSFIXER) fix --diff --dry-run --no-interaction -v
@@ -176,7 +177,7 @@ security-check: vendor  ## Check for vulnerable dependencies
 	@$(EXEC) vendor/bin/security-checker security:check
 
 test-schema: vendor ## Test the doctrine Schema
-	@$(EXEC) $(CONSOLE) doctrine:schema:validate --skip-sync -vvv --no-interaction
+	@$(CONSOLE) doctrine:schema:validate --skip-sync -vvv --no-interaction
 
 test-all: lint test-schema security-check tests  ## Lint all, check vulnerable dependencies, run PHP tests
 

docker-compose.dev.yml

@@ -4,9 +4,9 @@ services:
     build:
       context: .docker/mysql
       args:
-        MYSQL_USER: ${MYSQL_USER}
-        MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-        MYSQL_PORT: ${MYSQL_PORT}
+        MYSQL_USER: ${DB_USER}
+        MYSQL_PASSWORD: ${DB_PASS}
+        MYSQL_PORT: ${DB_PORT}
     ports:
       - 33060:3306 # Reserve port to localhost for database connexion on phpstorm
     volumes:
@@ -20,10 +20,10 @@ services:
       traefik.http.routers.pma.rule: "Host(`pma.localhost.tv`)"
       traefik.http.routers.pma.entrypoints: web
     environment:
-      PMA_HOST: db
-      PMA_PORT: 3306
-      PMA_USER: ${MYSQL_USER}
-      PMA_PASSWORD: ${MYSQL_PASSWORD}
+      PMA_HOST: ${DB_HOST}
+      PMA_PORT: ${DB_PORT}
+      PMA_USER: ${DB_USER}
+      PMA_PASSWORD: ${DB_PASS}
     ports:
       - 80
     volumes:
@@ -39,19 +39,33 @@ services:
           - pma.localhost.tv
 
   maildev:
-    image: djfarrelly/maildev
+    image: maildev/maildev
     labels:
       traefik.enable: true
-      traefik.http.services.maildev.loadbalancer.server.port: 80
+      traefik.http.services.maildev.loadbalancer.server.port: 1080
       traefik.http.routers.maildev.rule: "Host(`maildev.localhost.tv`)"
     ports:
-      - 80
-      - 25
+      - 1080
+      - 1025
     networks:
       sfdemo:
         aliases:
           - maildev.localhost.tv
 
+#  maildev:
+#    image: djfarrelly/maildev
+#    labels:
+#      traefik.enable: true
+#      traefik.http.services.maildev.loadbalancer.server.port: 80
+#      traefik.http.routers.maildev.rule: "Host(`maildev.localhost.tv`)"
+#    ports:
+#      - 80
+#      - 25
+#    networks:
+#      sfdemo:
+#        aliases:
+#          - maildev.localhost.tv
+
   traefik:
     image: traefik:v2.3
     command:

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - 80
       - 443
     volumes:
-      - ./project:/var/www/demo
+      - ./project:/var/www/project/demo
       - ./.docker/nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./.docker/nginx/sites:/etc/nginx/sites-enabled
     restart: unless-stopped
@@ -28,10 +28,10 @@ services:
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     restart: unless-stopped
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${DB_PASS}
+      MYSQL_DATABASE: ${DB_NAME}
+      MYSQL_USER: ${DB_USER}
+      MYSQL_PASSWORD: ${DB_PASS}
       TZ: ${TIMEZONE:-Europe/Paris}
     ports:
       - 3306
@@ -42,13 +42,13 @@ services:
     build: .docker/php
     restart: unless-stopped
     environment:
-      MYSQL_HOST: db
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_PORT: ${MYSQL_PORT}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_HOST: ${DB_HOST}
+      MYSQL_USER: ${DB_USER}
+      MYSQL_PASSWORD: ${DB_PASS}
+      MYSQL_PORT: ${DB_PORT}
+      MYSQL_DATABASE: ${DB_NAME}
     volumes:
-      - ./project:/var/www/demo
+      - ./project:/var/www/project/demo
       - ~/.cache/composer:/.composer # Share composer cache
     depends_on:
       - db