feat: Use php82

Makefile

@@ -24,11 +24,11 @@ requirements:
 	vendor/bin/requirements-checker
 
 cache :
-	docker-compose exec -u www-data app php bin/console cache:clear
-	docker-compose exec -u www-data app bin/console cache:pool:clear cache.global_clearer
+	docker compose exec -u www-data app php bin/console cache:clear
+	docker compose exec -u www-data app bin/console cache:pool:clear cache.global_clearer
 	# Force workers to restart
-	docker-compose exec -u www-data app php bin/console messenger:stop-workers
+	docker compose exec -u www-data app php bin/console messenger:stop-workers
 
 migrate:
-	docker-compose exec -u www-data app php bin/console doctrine:migrations:migrate
-	docker-compose exec -u www-data app php bin/console app:migrate
+	docker compose exec -u www-data app php bin/console doctrine:migrations:migrate
+	docker compose exec -u www-data app php bin/console app:migrate

config/packages/security.yaml

@@ -83,9 +83,6 @@ security:
                 max_attempts: 3
             logout:
                 path: logoutPage
-            guard:
-                authenticators:
-                    - lexik_jwt_authentication.jwt_token_authenticator
             custom_authenticator:
                 - RZ\Roadiz\RozierBundle\Security\RozierAuthenticator
                 - roadiz_rozier.open_id.authenticator

docker-compose.yml

@@ -119,7 +119,8 @@ services:
             #context: ./docker/php74-nginx-alpine
             #context: ./docker/php80-nginx-alpine
             #context: ./docker/php81-nginx-alpine
-            context: ./docker/php81-fpm-alpine
+            #context: ./docker/php81-fpm-alpine
+            context: ./docker/php82-fpm-alpine
             args:
                 USER_UID: ${USER_UID}
         depends_on:

docker/php82-fpm-alpine/Dockerfile

@@ -0,0 +1,36 @@
+FROM roadiz/php82-fpm-alpine
+MAINTAINER Ambroise Maupate <[email protected]>
+
+ARG USER_UID=1000
+ENV COMPOSER_ALLOW_SUPERUSER=1
+ENV APP_ENV=dev
+ENV APP_CACHE=0
+ENV APP_FFMPEG_PATH=/usr/bin/ffmpeg
+ENV MYSQL_HOST=db
+ENV MYSQL_PORT=3306
+
+RUN apk add --no-cache shadow make git ffmpeg \
+    && usermod -u ${USER_UID} www-data \
+    && groupmod -g ${USER_UID} www-data \
+    && composer --version \
+    && ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \
+    && "date" \
+    && echo "USER_UID: ${USER_UID}\n" \
+    && version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;")
+
+# Display errors
+ADD php.ini /usr/local/etc/php/php.ini
+ADD crontab.txt /crontab.txt
+ADD wait-for-it.sh /wait-for-it.sh
+ADD docker-php-entrypoint /usr/local/bin/docker-php-entrypoint
+
+VOLUME /var/www/html
+WORKDIR /var/www/html
+
+RUN chown -R www-data:www-data /var/www/html/
+
+RUN ln -s /var/www/html/bin/console /usr/local/bin/console \
+    && /usr/bin/crontab -u www-data /crontab.txt \
+    && chmod +x /wait-for-it.sh \
+    && chmod +x /usr/local/bin/docker-php-entrypoint \
+    && chown -R www-data:www-data /var/www/html/

docker/php82-fpm-alpine/crontab.txt

@@ -0,0 +1,12 @@
+# Roadiz maintenance tasks
+
+### Update Solr index
+0 0 * * *    cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console solr:reindex --no-debug -n -q
+
+### Maintenance tasks: erase +6 months logs and keeps only 20 node-source versions
+0 8 * * 1    cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console documents:file:size -q
+0 1 * * *    cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console logs:cleanup --erase -n -q
+0 2 * * *    cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console versions:purge -c 20 -n -q
+0 3 * * *    cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console custom-form-answer:prune -n -q
+### Empty node trashcan every month
+0 0 1 * *    cd /var/www/html && /usr/local/bin/php -d memory_limit=-1 bin/console nodes:empty-trash -n -q

docker/php82-fpm-alpine/docker-php-entrypoint

@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+#
+# Override default entrypoint to add some maintenance DEV only.
+# DO NOT CALL THIS SCRIPT FOR WORKERS AND CRON containers (see docker-compose.yml)
+#
+
+# Fix volume permissions
+/bin/chown -R www-data:www-data /var/www/html/var || true;
+/bin/chown -R www-data:www-data /var/www/html/public || true;
+/bin/chown -R www-data:www-data /var/www/html/config || true;
+
+# Print local env vars to .env.xxx.php file for performances and crontab jobs
+/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console cache:clear -n"
+/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console cache:pool:clear cache.global_clearer -n"
+/usr/bin/sudo -u www-data -- bash -c "/var/www/html/bin/console assets:install -n"
+/usr/bin/sudo -u www-data -- bash -c "/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}
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+exec "$@"

docker/php82-fpm-alpine/php.ini

@@ -0,0 +1,37 @@
+error_reporting = E_ALL & ~E_DEPRECATED
+html_errors = On
+
+apc.enable_cli = 0
+date.timezone = Europe/Paris
+session.auto_start = Off
+; Session ID cannot be passed through URLs
+session.use_only_cookies = On
+; Uses a secure connection (HTTPS) if possible
+; session.cookie_secure = On
+; Do not accept uninitialized session ID
+session.use_strict_mode = On
+; Do not make session cookie available to JS
+session.cookie_httponly = On
+short_open_tag = Off
+
+; http://symfony.com/doc/current/performance.html
+; Configure OPcache for Maximum Performance
+opcache.enable=1
+opcache.memory_consumption=256
+opcache.max_accelerated_files = 20000
+; Don't Check PHP Files Timestamps
+opcache.revalidate_freq=0
+opcache.validate_timestamps=1
+opcache.fast_shutdown=1
+; Configure the PHP realpath Cache
+realpath_cache_size = 4096K
+realpath_cache_ttl = 600
+memory_limit = 512M
+post_max_size = 256M
+upload_max_filesize = 128M
+expose_php = On
+display_errors = On
+
+# Sessions
+;session.save_handler = redis
+;session.save_path = "tcp://redis:6379"

docker/php82-fpm-alpine/wait-for-it.sh

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi

lib/RoadizCoreBundle/config/packages/security.yaml

@@ -79,9 +79,6 @@ security:
                 max_attempts: 3
             logout:
                 path: logoutPage
-            guard:
-                authenticators:
-                    - lexik_jwt_authentication.jwt_token_authenticator
             custom_authenticator:
                 - RZ\Roadiz\RozierBundle\Security\RozierAuthenticator