#1 Update .docker according to process-bundle one

Author: njoubert-cleverage

.docker/apache2/conf/apache2.conf

@@ -15,8 +15,8 @@
         SetHandler proxy:fcgi://php:9000
     </FilesMatch>
 
-    DocumentRoot /var/www/html/public
-    <Directory /var/www/html/public>
+    DocumentRoot /var/www/public
+    <Directory /var/www/public>
         AllowOverride None
         Require all granted
         FallbackResource /index.php

.docker/docker-compose.yml renamed to .docker/compose.yaml

@@ -1,33 +1,32 @@
 x-base-php: &base-php
   build:
-    context: ./php
+    context: php
     args:
       UID: ${UID:-1000}
       GID: ${GID:-1000}
       PHP_VERSION: ${PHP_VERSION:-8.2}
       XDEBUG_VERSION: ${XDEBUG_VERSION:-3.2.0}
   env_file: .env
   volumes:
-    - ../:${VOLUME_ROOT:-/var/www/html}
-    - ./php/ini/symfony.ini:/usr/local/etc/php/conf.d/99-symfony.ini
+    - ../:/var/www
   extra_hosts:
     - "host.docker.internal:host-gateway"
   environment:
-    COMPOSER_HOME: ${VOLUME_ROOT:-/var/www/html}/.composer
+    COMPOSER_HOME: /var/www/.composer
     COMPOSER_MEMORY_LIMIT: -1
     XDEBUG_MODE: ${XDEBUG_MODE:-off}
     PHP_IDE_CONFIG: serverName=sandbox_symfony
     XDEBUG_CONFIG: ${XDEBUG_CONFIG:-}
 
 x-base-apache2: &base-apache2
   build:
-    context: ./apache2
+    context: apache2
     args:
       UID: ${UID:-1000}
       GID: ${GID:-1000}
   env_file: .env
   volumes:
-    - ../:${VOLUME_ROOT:-/var/www/html}
+    - ../:/var/www
     - ./apache2/conf/apache2.conf:/etc/apache2/sites-available/000-default.conf
   depends_on:
     - php

.docker/docker-compose.override.yml

@@ -1,46 +1,47 @@
 ARG PHP_VERSION=8.2
-FROM php:${PHP_VERSION}-fpm AS php
+FROM php:${PHP_VERSION}-fpm-alpine AS php
+
 ARG XDEBUG_VERSION=3.1.4
 
-# Set user and group
-ARG UID=1000
-ARG GID=1000
-RUN usermod --uid ${UID} www-data && \
-    groupmod --gid ${GID} www-data
+ARG UID
+ARG GID
 
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-RUN chmod +x /usr/local/bin/install-php-extensions
-RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash -E
+RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
+COPY /conf.d/ "$PHP_INI_DIR/conf.d/"
 
-# Install packages
-RUN apt-get update && apt-get install -y \
+RUN apk update && apk add \
+    tzdata \
+    shadow \
+    nano \
+    bash \
+    icu-dev \
+    libxml2-dev \
+    libzip-dev \
+    postgresql-dev \
+    unzip \
     wget \
     git \
-    unzip \
-    libicu-dev \
-    libzip-dev \
-    gosu \
-    symfony-cli \
-    procps \
     && docker-php-ext-configure intl \
-    && install-php-extensions \
-        intl \
-        pcntl \
-        opcache \
-        zip \
-        gd \
-        imagick \
-        pdo \
-        pdo_pgsql \
-        pgsql \
-        pdo_mysql \
-        mysqli \
-        sysvsem
-RUN pecl install xdebug-${XDEBUG_VERSION}
-## Install composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+    && docker-php-ext-install intl soap opcache zip pdo pdo_pgsql pdo_mysql \
+    && docker-php-ext-enable soap opcache
+
+RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} \
+  && apk add --update linux-headers \
+  && pecl install xdebug-${XDEBUG_VERSION} \
+  && apk del pcre-dev ${PHPIZE_DEPS}
+
+RUN ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \
+    && sed -i "s/^;date.timezone =.*/date.timezone = Europe\/Paris/" $PHP_INI_DIR/php.ini
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+RUN usermod -u $UID www-data \
+    && groupmod -g $GID www-data
+
+USER www-data:www-data
+
+WORKDIR /var/www
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["entrypoint.sh"]
 CMD ["php-fpm"]

.docker/php/Dockerfile

@@ -0,0 +1,9 @@
+display_errors = 1
+error_reporting = E_ALL
+
+opcache.validate_timestamps = 1
+opcache.revalidate_freq = 0
+
+memory_limit=512M
+post_max_size = 6M
+upload_max_filesize = 5M

.docker/php/conf.d/dev.ini

@@ -5,7 +5,4 @@ if [[ "${XDEBUG_MODE}" != "off" ]]; then
     docker-php-ext-enable xdebug
 fi
 
-[ "$1" == 'bin/console' ] || [ "$1" == 'bash' ] || [ "$1" == 'php' ] && \
-  exec gosu www-data docker-php-entrypoint "$@"
-
 exec docker-php-entrypoint "$@"

.docker/php/entrypoint.sh

@@ -1,11 +1,10 @@
 .ONESHELL:
 SHELL := /bin/bash
 
-DOCKER_RUN_PHP = docker compose -f .docker/docker-compose.yml -f .docker/docker-compose.override.yml run --rm php "bash" "-c"
-DOCKER_COMPOSE = docker compose -f .docker/docker-compose.yml -f .docker/docker-compose.override.yml
+DOCKER_RUN_PHP = docker compose -f .docker/compose.yaml run --rm php "bash" "-c"
+DOCKER_COMPOSE = docker compose -f .docker/compose.yaml
 
-
-start: upd doctrine/migrations assets/install #[Global] Start application (but not consumers, use supervisorctl/start)
+start: upd doctrine/migrations assets/install #[Global] Start application
 
 src/vendor: #[Composer] install dependencies
 	$(DOCKER_RUN_PHP) "composer install --no-interaction"
@@ -44,9 +43,6 @@ doctrine/migrations: #[Symfony] Run database migration
 assets/install: #[Symfony] Install assets
 	$(DOCKER_RUN_PHP) "bin/console assets:install"
 
-cache/clean: #[Symfony] Clean cache
-	$(DOCKER_RUN_PHP) "bin/console c:c"
-
 xdebug/on: #[Docker] Enable xdebug
 	$(DOCKER_COMPOSE) stop php
 	XDEBUG_MODE=debug,develop $(DOCKER_COMPOSE) up --remove-orphans --detach