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

Author: nmaillat

.dockerignore

@@ -8,6 +8,7 @@
 /env.*
 /.git
 /.gitignore
+/.github
 /.travis.yml
 /AUTHORS
 /CONTRIBUTORS
@@ -38,4 +39,8 @@
 /www/thumbnails
 /www/.htaccess
 npm-debug.log
-stack_management.sh
+stack.sh
+/.vagrant
+/Vagrantfile
+
+

.env

@@ -42,7 +42,7 @@
 #
 # - "docker-compose.limits.yml"     : defines containers cpu and memory limits for all Phraseanet and gateway containers only.
 #
-# - "docker-compose.altenatives.yml": all alternative services, used only on evoluation or transition periods
+# - "docker-compose.alternatives.yml": all alternative services, used only on evolution or transition or testing periods
 #
 # 2/ "COMPOSE_PROFILES" value define which profiles you want to use
 # in docker-compose.
@@ -60,8 +60,9 @@
 #                       choose to launch only some workers, see worker profile list below.
 # - "worker"          : launch one container worker with all jobs run on it.
 # - "cmd"             : launch a container based on worker image, useful for run cmd manualy. 
-# - "db"              : db profile will launch a mariadb container,
+# - "db"              : db profile will launch a mariadb container, with data stored on host and mounted in the db container.
 #                       because this is the primary datastore, you should use you own SGDD service for production needs.
+# - "db-docker-vol"   : same as "db" profile but with data stored in a docker volume.
 # - "elastisearch"    : launch a elasticsearch container.
 # - "rabbitmq"        : launch a rabbitmq container.
 # - "redis"           : launch a redis container for app cache.
@@ -72,7 +73,7 @@
 # - "mailhog"         : for catching all email emit by app for dev and testing.
 # - "db-backup"       : launch and run a container to cron database backups and backup file's rotation.
 # - "pma"             : launch a phpmyadmin container for test and dev purpose.
-# - "mysql8"          : launch a mysql8 container (beta), (/!\ do not mix with the "db" profile)
+# - "db-mysql8"       : launch a mysql8 container (beta), (/!\ do not mix with the "db" profile)
 #                       Because this is the primary datastore, you should use you own SGDD service for production needs.
 #
 # Profiles worker list:
@@ -257,7 +258,7 @@ PHRASEANET_MAINTENANCE=0
 # Example :
 # PHRASEANET_MAINTENANCE_MESSAGE="<p>Under&#32;maintenance!</p><p>More&#32;information&#32;<a href=\"https://www.yoururl.fr\">here</a></p>"
 # @run
-PHRASEANET_MAINTENANCE_MESSAGE=
+PHRASEANET_MAINTENANCE_MESSAGE="Site: $PHRASEANET_PROJECT_NAME are under Maintenance ! Sorry, come back Later"
 
 # --- RabbitMQ settings ------------------------------------------------------------------------------------------------
 
@@ -279,7 +280,7 @@ RABBITMQ_MANAGEMENT_PORT=10811
 RABBITMQ_HOSTNAME=rabbit_phraseanet
 
 # @run
-RABBITMQ_IMAGE_VERSION=rabbitmq:4.1.0-management
+RABBITMQ_IMAGE_TAG=rabbitmq:4.1.0-management
 
 # --- Gateway settings (Nginx) -----------------------------------------------------------------------------------------
 
@@ -580,6 +581,17 @@ DB_BACKUP_CRON_TIME=
 # @run
 DB_BACKUP_GZIP_LEVEL=9
 
+# --- redis cache settings ---------------------------------------------------------------------------------------------
+
+# Redis session Image Tag.
+# @run
+REDIS_CACHE_IMAGE_TAG=redis:8.0.1
+
+# --- redis session settings ---------------------------------------------------------------------------------------------
+
+# Redis cache Image Tag.
+# @run
+REDIS_SESSION_IMAGE_TAG=redis:8.0.1
 
 # --- Pusher Settings ---
 # Phraseanet use the Pusher service to notify users of asynchronous downloads https://pusher.com.

README.md

@@ -97,8 +97,8 @@ Get official support : https://www.alchemy.fr/en/rubrique/services/
 ## Prerequisites
 
 
-- docker >=25.0.5
-- docker compose >= 2.29.0
+- docker >=27.3.1
+- docker compose >= 2.30.3
 
 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, 
@@ -186,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
@@ -198,24 +198,26 @@ 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.
+These files are git ignored and permit stack customization without git conflict.
 
 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.
+
+To start and stop the stack, use the `stack_management.sh start|stop|info|status|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)
+see more here ![stack](doc/infra/compose/stack.md)
 
 ### Using a env.local method for custom .env values
 

doc/infra/compose/stack_management.md renamed to doc/infra/compose/stack.md

@@ -12,7 +12,7 @@ This script is an helper designed to manage a Phraseanet Docker compose stack by
 - **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
 
@@ -26,32 +26,32 @@ This script is an helper designed to manage a Phraseanet Docker compose stack by
 
 - **Start the Stack**:
   ```bash
-  ./manage_docker.sh start
+  ./stack.sh start
   ```
 
 - **Stop the Stack**:
   ```bash
-  ./manage_docker.sh stop
+  ./stack.sh stop
   ```
 
 - **Check Versions**:
   ```bash
-  ./manage_docker.sh check
+  ./stack.sh status
   ```
 
 - **Display Environment Information**:
   ```bash
-  ./manage_docker.sh info
+  ./stack.sh info
   ```
 
 - **View Logs**:
   - For all containers:
     ```bash
-    ./manage_docker.sh log
+    ./stack.sh logs
     ```
   - For a specific container:
     ```bash
-    ./manage_docker.sh log <container_name>
+    ./stack.sh logs <container_name>
     ```
 
 ### Environment Variables

docker-compose.altenatives.yml renamed to docker-compose.alternatives.yml

@@ -1,18 +1,17 @@
 services:
-
-  db:
+  db-mysql8:
     image: mysql:8.0.36-debian
     # NOTE: use of "mysql_native_password" is not recommended: https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password
     # (this is just an example, not intended to be a production configuration)
     command: --default-authentication-plugin=mysql_native_password --max_allowed_packet=$MYSQL_MAX_ALLOWED_PACKET --max_connections=$MYSQL_MAX_CONNECTION --long_query_time=$MYSQL_LONG_QUERY_TIME --sql_mode="NO_ENGINE_SUBSTITUTION"
     restart: on-failure
-    profiles: ["mysql8"]
+    profiles: ["db-mysql8"]
     entrypoint:
-      sh -c "
+      sh -c \"
         echo 'CREATE DATABASE IF NOT EXISTS ab_master CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;CREATE DATABASE IF NOT EXISTS db_databox1 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;CREATE DATABASE IF NOT EXISTS db_unitTest CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;CREATE DATABASE IF NOT EXISTS db_dataset1 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;CREATE DATABASE IF NOT EXISTS db_dataset2 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; CREATE USER `$PHRASEANET_DB_USER`@`%` IDENTIFIED BY \"$PHRASEANET_DB_PASSWORD\";GRANT ALL PRIVILEGES ON *.* to `$PHRASEANET_DB_USER`@`%`;' > /docker-entrypoint-initdb.d/init.sql;
         chmod +x /usr/local/bin/docker-entrypoint.sh /docker-entrypoint-initdb.d/init.sql;
         /usr/local/bin/docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password --max_allowed_packet=$MYSQL_MAX_ALLOWED_PACKET --max_connections=$MYSQL_MAX_CONNECTION --long_query_time=$MYSQL_LONG_QUERY_TIME --sql_mode="NO_ENGINE_SUBSTITUTION" --slow_query_log=$MYSQL_SLOW_QUERY_LOG
-      "
+      \"
     environment:
     - MYSQL_ROOT_PASSWORD
     - MYSQL_MAX_ALLOWED_PACKET
@@ -27,4 +26,9 @@ services:
     volumes:
     - ${PHRASEANET_DB_DIR}_mysql8:/var/lib/mysql:rw
     networks:
-      - internal
+       internal:
+         aliases:
+            - db
+    pre_stop:
+      - command: '/usr/bin/mysqladmin -uroot -p"$MYSQL_ROOT_PASSWORD" shutdown'        
+

docker-compose.datastores.yml

@@ -19,37 +19,71 @@ services:
     volumes:
     - ${PHRASEANET_DB_DIR}:/var/lib/mysql
     networks:
-      - internal
+      internal:
+         aliases:
+            - db
+    pre_stop:
+      - command: '/usr/bin/mysqladmin -uroot -p"$MYSQL_ROOT_PASSWORD" shutdown'
 
+  db-docker-vol:
+    image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-db:$PHRASEANET_DOCKER_TAG
+    build: ./docker/db
+    restart: on-failure
+    profiles: ["db-docker-vol"]
+    environment:
+    - MYSQL_ROOT_PASSWORD
+    - MYSQL_MAX_ALLOWED_PACKET
+    - MYSQL_MAX_CONNECTION
+    - MYSQL_LONG_QUERY_TIME
+    - MYSQL_SLOW_QUERY_LOG
+    - MYSQL_QUERY_CACHE_LIMIT
+    - MYSQL_QUERY_CACHE_SIZE
+    - MYSQL_KEY_BUFFER_SIZE
+    - MYSQL_CONNECT_TIMEOUT
+    - MYSQL_WAIT_TIMEOUT
+    - MARIADB_AUTO_UPGRADE
+    volumes:
+    - db_vol:/var/lib/mysql
+    networks:
+       internal:
+         aliases:
+            - db
+    pre_stop:
+      - command: '/usr/bin/mysqladmin -uroot -p"$MYSQL_ROOT_PASSWORD" shutdown'
   rabbitmq:
-    image: $RABBITMQ_IMAGE_VERSION
+    image: $RABBITMQ_IMAGE_TAG
     profiles: ["rabbitmq"]
     restart: on-failure
     hostname: $RABBITMQ_HOSTNAME
     environment:
     - RABBITMQ_DEFAULT_USER
     - RABBITMQ_DEFAULT_PASS
+    - PHRASEANET_RABBITMQ_VHOST
     volumes:
       - rabbitmq_vol:/var/lib/rabbitmq
     networks:
       - internal
 
   redis:
-    image: redis
+    image: $REDIS_CACHE_IMAGE_TAG
     profiles: ["redis"]
     restart: on-failure
     networks:
       - internal
 
   redis-session:
-    image: redis
+    image: $REDIS_SESSION_IMAGE_TAG
     profiles: ["redis-session"]
     restart: on-failure
     networks:
       - internal
 
   elasticsearch:
     image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-elasticsearch:$PHRASEANET_DOCKER_TAG
+    ulimits:
+      nofile:
+        soft: 65536
+        hard: 65536
     profiles: ["elasticsearch"]
     build: ./docker/elasticsearch
     restart: on-failure

docker-compose.tools.yml

@@ -28,8 +28,6 @@ services:
     restart: on-failure
     ports:
       - ${PHRASEANET_PHPMYADMIN_PORT}:80
-    depends_on:
-      - db
     networks:
       - internal
 

docker-compose.yml

@@ -271,6 +271,7 @@ services:
     - SESSION_SAVE_HANDLER
     - SESSION_SAVE_PATH
     - PHRASEANET_MAINTENANCE
+    - PHRASEANET_MAINTENANCE_MESSAGE
     - FPM_MEMORY_LIMIT
     - FPM_PM_TYPE
     - FPM_MAXCHILDREN

lib/Alchemy/Phrasea/Controller/Prod/StoryController.php

@@ -35,7 +35,7 @@ public function displayCreateFormAction(Request $request)
         $storyTitleMetaStructIds = [];
         foreach ($this->getApplicationBox()->get_databoxes() as $db) {
             foreach ($db->get_meta_structure() as $metaStruct) {
-                if ($metaStruct->get_thumbtitle() == "1" &&
+                if ($metaStruct->get_thumbtitle() != "0" &&
                     !$metaStruct->is_readonly() &&
                     $metaStruct->get_gui_editable() &&
                     $metaStruct->get_type() == \databox_field::TYPE_STRING