From bda5d4475a7993e5486e5fa1df2d94279c519326 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Wed, 13 Sep 2023 21:32:31 +0200 Subject: [PATCH] PHRAS-3387 add missing env on workers (#4374) * PHRAS-3387 add missing env on some workers PHRAS-3668 stop launching subtitle worker, this worker have stopped to work caused by partner failure * PHRAS-3668 stop launching subtitle worker, this worker have stopped to work caused by partner failure * changelog update --- .env | 6 +++--- CHANGELOG.md | 1 + docker-compose.yml | 8 +++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 80272828fb..f4bb83ea5c 100644 --- a/.env +++ b/.env @@ -71,7 +71,7 @@ # - "pullAssets" # - "recordsActions" # - "subdefCreation" -# - "subtitle" +# - "subtitle" Not working (fixed in a future version) # - "validationReminder" # - "webhook" # - "writeMetadatas" @@ -90,7 +90,7 @@ # - COMPOSE_FILE=docker-compose.yml:docker-compose.datastores.yml:docker-compose.tools.yml:docker-compose.override.yml # - COMPOSE_PROFILES=app,setup,db,pma,elasticsearch,redis,redis-session,rabbitmq,workers,mailhog,builder,gateway-classic # -# For testing with debug: +# For testing with tools: # - COMPOSE_FILE=docker-compose.yml:docker-compose.datastores.yml:docker-compose.tools.yml # - COMPOSE_PROFILES=app,setup,db,pma,elasticsearch,rabbitmq,redis,redis-session,worker,workers,mailhog,gateway-classic # @@ -106,7 +106,7 @@ # - COMPOSE_FILE=docker-compose.yml:docker-compose.datastores.yml:docker-compose.tools.yml # - COMPOSE_PROFILES=app,setup,gateway-classic,db,elasticsearch,redis,redis-session,rabbitmq,pma,mailhog,assetsInjest,createRecord,deleteRecord,editRecord, # exportMail,exposeUpload,exportFtp,mainQueue,populateIndex,pullAssets,recordsActions,subdefCreation, -# subtitle,validationReminder,webhook,writeMetadatas,shareBasket,scheduler,elk,db-backup,phraseanet-saml-sp +# validationReminder,webhook,writeMetadatas,shareBasket,scheduler,elk,db-backup,phraseanet-saml-sp # diff --git a/CHANGELOG.md b/CHANGELOG.md index b64eebf933..48a2ecca3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ * PHRAS-3903 Admin - object inspector - record index debug tools by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4369 * PHRAS-3904 Add server port on fastcgi - SAML multi provider support https conf by @moctardiouf in https://github.com/alchemy-fr/Phraseanet/pull/4370 * PHRAS-3889 Worker - metadata write - mime/type whitelist - write metadatas only on whitelisted files by @aynsix in https://github.com/alchemy-fr/Phraseanet/pull/4366 +* PHRAS-3910 fix redis php extension build by @moctardiouf in https://github.com/alchemy-fr/Phraseanet/pull/4373 **Full Changelog**: https://github.com/alchemy-fr/Phraseanet/compare/4.1.8-rc5...4.1.8-rc6 diff --git a/docker-compose.yml b/docker-compose.yml index 894e20dea3..121afb92ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -470,6 +470,7 @@ services: - OPCACHE_ENABLED - SESSION_CACHE_LIMITER - PHP_LOG_LEVEL + - PHP_CLI_MEMORY_LIMIT - LC_MESSAGES=C.UTF-8 - LC_COLLATE=C.UTF-8 - LC_IDENTIFICATION=C.UTF-8 @@ -524,6 +525,7 @@ services: - OPCACHE_ENABLED - SESSION_CACHE_LIMITER - PHP_LOG_LEVEL + - PHP_CLI_MEMORY_LIMIT - LC_MESSAGES=C.UTF-8 - LC_COLLATE=C.UTF-8 - LC_IDENTIFICATION=C.UTF-8 @@ -685,6 +687,7 @@ services: - OPCACHE_ENABLED - SESSION_CACHE_LIMITER - PHP_LOG_LEVEL + - PHP_CLI_MEMORY_LIMIT - LC_MESSAGES=C.UTF-8 - LC_COLLATE=C.UTF-8 - LC_IDENTIFICATION=C.UTF-8 @@ -792,6 +795,7 @@ services: - OPCACHE_ENABLED - SESSION_CACHE_LIMITER - PHP_LOG_LEVEL + - PHP_CLI_MEMORY_LIMIT - LC_MESSAGES=C.UTF-8 - LC_COLLATE=C.UTF-8 - LC_IDENTIFICATION=C.UTF-8 @@ -845,6 +849,7 @@ services: - OPCACHE_ENABLED - SESSION_CACHE_LIMITER - PHP_LOG_LEVEL + - PHP_CLI_MEMORY_LIMIT - LC_MESSAGES=C.UTF-8 - LC_COLLATE=C.UTF-8 - LC_IDENTIFICATION=C.UTF-8 @@ -1009,6 +1014,7 @@ services: - OPCACHE_ENABLED - SESSION_CACHE_LIMITER - PHP_LOG_LEVEL + - PHP_CLI_MEMORY_LIMIT - LC_MESSAGES=C.UTF-8 - LC_COLLATE=C.UTF-8 - LC_IDENTIFICATION=C.UTF-8 @@ -1053,7 +1059,7 @@ services: - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY} - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS} image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-worker:$PHRASEANET_DOCKER_TAG - profiles: ["workers", "subtitle"] + profiles: ["subtitle"] restart: on-failure depends_on: - phraseanet