Merge branch 'master' into PHRAS-4155_4.1.19_release

Author: nmaillat

.dockerignore

@@ -38,3 +38,4 @@
 /www/thumbnails
 /www/.htaccess
 npm-debug.log
+stack_management.sh

README.md

@@ -97,7 +97,8 @@ Get official support : https://www.alchemy.fr/en/rubrique/services/
 ## Prerequisites
 
 
-- docker >=v20.10.24
+- docker >=25.0.5
+- docker compose >= 2.29.0
 
 In the stack Docker, Docker Compose included in this repo starts by default in test mode. 
 All services are launched in a separate container and except "Phraseanet app" and "workers" containers, 
@@ -185,7 +186,7 @@ COMPOSE_PROFILES=app,gateway-classic,db,pma,elasticsearch,redis,redis-session,ra
 
 
 You should review the default env variables defined in `.env` file.
-Use `export` method to override these values.
+Use `export` method to override these values 
 
 i.e:
 ```bash
@@ -194,9 +195,28 @@ export [email protected]
 export INSTALL_ACCOUNT_PASSWORD=$3cr3t!
 export PHRASEANET_APP_PORT=8082
 ```
+
+If you want persit this change you can also save your change in a files named `env.local` or `.env.local`
+
+These files are git ignored and permit stack customization without git conflict generation.
+
 If you are not interested in the development of Phraseanet, you can ignore everything in `.env` after the `DEV Purpose` part.
 
 
+### stack Management
+ 
+To start and stop the stack, use the `stack_management.sh start|stop|info|check|log` script at the project root.
+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 Management](doc/infra/compose/stack_management.md)
+
 ### Using a env.local method for custom .env values
 
 It may be easier to deal with a local file to manage our env variables.
@@ -411,8 +431,3 @@ You can also download a testing pre installed Virtual Machine in OVA format here
 
 https://www.phraseanet.com/download/
 
-
-
-
-
-

doc/infra/compose/stack_management.md

@@ -0,0 +1,72 @@
+Certainly! Here's a README for the script that provides an overview of its functionality, usage, and features:
+
+---
+
+# Docker Stack Management Script
+
+This script is an helper designed to manage a Phraseanet Docker compose stack by wrapping docker compose commande. It provides functionalities to start, stop, check, and gather information about the Docker stack, including docker and Phraseanet version checks, log viewing, and environment details.
+
+## Features
+
+- **Start and Stop the Docker Stack**: Easily start or stop your Docker stack with simple commands.
+- **Version Checking**: Verify the compatibility of Docker and Docker Compose versions.
+- **Environment Information**: Gather detailed information about the environment, including Phraseanet installation status, version details, and internal URLs.
+- **Log Viewing**: View logs for all containers or filter logs for a specific container.
+- **Environment Variables**: Load and display environment variables from `.env` and either `env.local` or `.env.local` files.
+
+## Usage
+
+### Prerequisites
+
+- Docker and Docker Compose installed on your system.
+- Appropriate permissions to execute Docker commands.
+- Environment files (`.env`, `env.local`, or `.env.local`) configured with necessary variables.
+
+### Commands
+
+- **Start the Stack**:
+  ```bash
+  ./manage_docker.sh start
+  ```
+
+- **Stop the Stack**:
+  ```bash
+  ./manage_docker.sh stop
+  ```
+
+- **Check Versions**:
+  ```bash
+  ./manage_docker.sh check
+  ```
+
+- **Display Environment Information**:
+  ```bash
+  ./manage_docker.sh info
+  ```
+
+- **View Logs**:
+  - For all containers:
+    ```bash
+    ./manage_docker.sh log
+    ```
+  - For a specific container:
+    ```bash
+    ./manage_docker.sh log <container_name>
+    ```
+
+### Environment Variables
+
+The script uses the following environment variables, which should be defined in your environment files:
+
+- `PHRASEANET_DOCKER_TAG`: The Docker tag for the Phraseanet image.
+- `PHRASEANET_DOCKER_REGISTRY`: The Docker registry for the Phraseanet image.
+- `PHRASEANET_HOSTNAME`: The hostname for the Phraseanet instance.
+- `PHRASEANET_SCHEME`: The scheme (e.g., `http` or `https`) for the Phraseanet instance.
+- `PHRASEANET_APP_PORT`: The port for the Phraseanet application.
+
+### Notes
+
+- Ensure that the environment files (`.env`, `env.local`, or `.env.local`) are correctly configured with the necessary variables.
+- The script checks for the presence of `config/configuration.yml` to determine if Phraseanet is installed.
+- The script constructs the internal URL of the Phraseanet instance using the environment variables `PHRASEANET_HOSTNAME`, `PHRASEANET_SCHEME`, and `PHRASEANET_APP_PORT`.
+

docker-compose.altenatives.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
   db:

docker-compose.datastores.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services: 
   db:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-db:$PHRASEANET_DOCKER_TAG

docker-compose.limits.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   gateway:
     deploy:

docker-compose.override.yml

@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   gateway:
     volumes:

docker-compose.tools.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   mailhog:
     image: mailhog/mailhog

docker-compose.under-phrasea.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
     phrasea:
       name: ${PHRASEA_NETWORK_NAME}

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   internal:
     ipam:
@@ -285,6 +283,14 @@ services:
     - PHRASEANET_SESSION_PORT
     - PHRASEANET_USER_SESSION_IDLE
     - PHRASEANET_USER_SESSION_LIFETIME
+    - IMAGEMAGICK_POLICY_VERSION
+    - IMAGEMAGICK_POLICY_WIDTH
+    - IMAGEMAGICK_POLICY_HEIGHT
+    - IMAGEMAGICK_POLICY_MAP
+    - IMAGEMAGICK_POLICY_MEMORY
+    - IMAGEMAGICK_POLICY_AREA
+    - IMAGEMAGICK_POLICY_DISK
+    - IMAGEMAGICK_POLICY_TEMPORARY_PATH
     volumes:
     - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
     - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw