diff --git a/.env b/.env index 7711ee4cde..af423b97c8 100644 --- a/.env +++ b/.env @@ -258,7 +258,7 @@ PHRASEANET_MAINTENANCE=0 # Example : # PHRASEANET_MAINTENANCE_MESSAGE="

Under maintenance!

More information here

" # @run -PHRASEANET_MAINTENANCE_MESSAGE="Site: $PHRASEANET_PROJECT_NAME are under Maintenance ! Sorry, come back Later" +PHRASEANET_MAINTENANCE_MESSAGE= # --- RabbitMQ settings ------------------------------------------------------------------------------------------------ diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d9c99696..8c847a8471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,17 +13,25 @@ ### Stack (Docker Compose and Helm) -- RabbitMQ image version can be set in .env and bumped to 4.1.0 -- Introducing a stack_management script for Linux and Macos performing a clean stop of db container +- The RabbitMQ image version can be set in the .env file and updated to 4.1.0-management. +- Introducing a stack_management script, a shortcut for the stack only for Linux and macOS hosts. +- The Minimum required Docker and Docker compose version are now `docker >=27.3.1` and `compose >= 2.30.3` +- Defining Elasticsearch ulimits. ### Version Summary - - To do - + +- New API routes for retrieving a story from records. +- Bug fix on story title. +- ImageMagick policies are applied in the fpm container + ## What's Changed - - * PHRAS-4151_stories-reference-in-api by @jygaulier in https://github.com/alchemy-fr/Phraseanet/pull/4602 - * PHRAS-4153: Rabbitmq : Update rabbitmq to 4.1.0 to fix CVE-2025-32433 by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4601 +* PHRAS-4151_stories-reference-in-api by @jygaulier in https://github.com/alchemy-fr/Phraseanet/pull/4602 +* PHRAS-4153: Rabbitmq : Update rabbitmq to 4.1.0 to fix CVE-2025-32433 by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4601 +* PHRAS-4154 imageMagick policies management in FPM container by @nmaillat in https://github.com/alchemy-fr/Phraseanet/pull/4604 +* PHRAS-4156 Redis image tag from env and others docker stacks fix by @nmaillat in https://github.com/alchemy-fr/Phraseanet/pull/4608 +* PHRAS-4157 Add Elasticsearch ulimits inside docker-compose.datastores.yml by @gjacobjn in https://github.com/alchemy-fr/Phraseanet/pull/4612 +* PHRAS-4158: Prod - Story -Story title is Nok when is not thumbtitle="1" by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4614 +* PHRAS-4149 stack management by @nmaillat in https://github.com/alchemy-fr/Phraseanet/pull/4615 **Full Changelog**: https://github.com/alchemy-fr/Phraseanet/compare/4.1.18...4.1.19 diff --git a/README.md b/README.md index c75c521673..02c481aa33 100644 --- a/README.md +++ b/README.md @@ -211,10 +211,6 @@ this script work only Linux and MacOS. This script wrapping standard oprations for the stack, using standard docker compose cmd and take in account `.env` and `env.local | .env.local` files. - -The `stop` operation is the most critical function of the script, as it ensures a clean shutdown -of the database container before stopping the entire stack. - This script is useful if you are using the database container within the stack. see more here ![stack](doc/infra/compose/stack.md) diff --git a/stack.sh b/stack.sh index 4e9f1b48d3..118abf9c18 100755 --- a/stack.sh +++ b/stack.sh @@ -166,14 +166,9 @@ start_stack() { # Function to stop the Docker stack stop_stack() { - echo "Stopping the MySQL server in the db container..." - # Execute the mysqladmin command inside the container where the environment variable is defined - $DOCKER_COMPOSE_CMD exec db sh -c '/usr/bin/mysqladmin -uroot -p"$MYSQL_ROOT_PASSWORD" shutdown' - echo - echo "Stopping the Docker stack..." local env_files=($(get_env_files)) - $DOCKER_COMPOSE_CMD "${env_files[@]/#/--env-file=}" down + $DOCKER_COMPOSE_CMD down } # Function rabbimq queue information