Merge remote-tracking branch 'origin/develop' into develop

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.71'
+    app.version: '0.1.72'

deploy/docker/deploy.sh

@@ -18,11 +18,11 @@ echo "==> Waiting for container to be ready..."
 sleep 3
 
 echo "==> Running migrations..."
-docker compose exec -T app php bin/console doctrine:migrations:migrate --no-interaction
+docker compose exec -T -u www-data app php bin/console doctrine:migrations:migrate --no-interaction
 
 echo "==> Clearing cache..."
-docker compose exec -T app php bin/console cache:clear --env=prod
-docker compose exec -T app php bin/console cache:warmup --env=prod
+docker compose exec -T -u www-data app php bin/console cache:clear --env=prod
+docker compose exec -T -u www-data app php bin/console cache:warmup --env=prod
 
 VERSION=$(docker compose exec -T app cat config/version.yaml | grep 'app.version' | awk -F"'" '{print $2}')
 echo "==> Deployed v${VERSION}"

doc/deployment-docker.md

@@ -136,10 +136,15 @@ HOLIDAY_URL="https://calendrier.api.gouv.fr/jours-feries/"
 
 ```bash
 mkdir -p config/jwt
-docker run --rm -v $(pwd)/config/jwt:/jwt php:8.4-cli bash -c \
-  "apt-get update -qq && apt-get install -y -qq openssl > /dev/null && \
-   openssl genpkey -algorithm RSA -out /jwt/private.pem -pkeyopt rsa_keygen_bits:4096 && \
-   openssl rsa -pubout -in /jwt/private.pem -out /jwt/public.pem"
+openssl genpkey -algorithm RSA -out config/jwt/private.pem -pkeyopt rsa_keygen_bits:4096
+openssl rsa -pubout -in config/jwt/private.pem -out config/jwt/public.pem
+```
+
+Rendre les cles lisibles par le conteneur (www-data = uid 33) :
+
+```bash
+sudo chown 33:33 config/jwt/private.pem config/jwt/public.pem
+sudo chmod 644 config/jwt/private.pem config/jwt/public.pem
 ```
 
 ### 5. Creer le dossier uploads