From 418a0ed03967492415c6ed667f94f2110c3d14ed Mon Sep 17 00:00:00 2001 From: nmaillat Date: Tue, 12 Dec 2023 11:19:50 +0100 Subject: [PATCH 1/4] removing Blackfire --- Dockerfile | 9 +--- docker-compose.yml | 67 +------------------------- docker/phraseanet/worker/entrypoint.sh | 11 +---- 3 files changed, 4 insertions(+), 83 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00d5748abe..dedb009331 100644 --- a/Dockerfile +++ b/Dockerfile @@ -166,18 +166,13 @@ RUN echo "BUILDING AND INSTALLING FFMPEG" \ && make distclean \ ) #&& rm -rf /tmp/ffmpeg -RUN echo "INSTALLING NEWRELIC AND BLACKFIRE EXTENTIONS" \ +RUN echo "INSTALLING NEWRELIC EXTENTION" \ && echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list \ && curl -o- https://download.newrelic.com/548C16BF.gpg | apt-key add - \ && apt-get update \ && apt-get install -y newrelic-php5 \ && NR_INSTALL_SILENT=1 newrelic-install install \ - && touch /etc/newrelic/newrelic.cfg \ - && curl -o- https://packages.blackfire.io/gpg.key |apt-key add - \ - && echo "deb http://packages.blackfire.io/debian any main" |tee /etc/apt/sources.list.d/blackfire.list \ - && apt update \ - && apt install blackfire-agent \ - && apt install blackfire-php + && touch /etc/newrelic/newrelic.cfg RUN echo "FINALIZING BUILD AND CLEANING" \ && apt-get clean \ && rm -rf /var/lib/apt/lists \ diff --git a/docker-compose.yml b/docker-compose.yml index fa829ef567..b6f511b46a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -166,9 +166,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN - SESSION_SAVE_HANDLER - SESSION_SAVE_PATH - PHRASEANET_CACHE_TYPE @@ -255,9 +252,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN - SESSION_SAVE_HANDLER - SESSION_SAVE_PATH - PHRASEANET_MAINTENANCE @@ -308,6 +302,7 @@ services: - LC_NAME=C.UTF-8 - PHRASEANET_EXPLODE_WORKER - PHRASEANET_WORKERS_LAUNCH_METHOD + - PHRASEANET_WORKER_CUSTOM - PHRASEANET_WORKER_assetsIngest - PHRASEANET_WORKER_createRecord - PHRASEANET_WORKER_deleteRecord @@ -337,9 +332,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -391,9 +383,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -446,9 +435,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -500,9 +486,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -555,9 +538,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -609,9 +589,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -663,9 +640,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -717,9 +691,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -771,9 +742,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -825,9 +793,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -879,9 +844,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -933,9 +895,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -987,9 +946,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1044,9 +1000,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1098,9 +1051,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1152,9 +1102,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1206,9 +1153,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1260,9 +1204,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1314,9 +1255,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw @@ -1366,9 +1304,6 @@ services: - NEWRELIC_ENABLED - NEWRELIC_LICENSE_KEY - NEWRELIC_APP_NAME - - BLACKFIRE_ENABLED - - BLACKFIRE_SERVER_ID - - BLACKFIRE_SERVER_TOKEN volumes: - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index afbbce5596..af441aabb5 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -70,16 +70,6 @@ else rm -f /usr/local/etc/php/conf.d/newrelic.ini fi -if [[ $BLACKFIRE_ENABLED = "true" ]]; then - echo `date +"%Y-%m-%d %H:%M:%S"` " - BlackFire setup." - blackfire-agent --register --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN - service blackfire-agent start - echo "Blackfire setup done" -else - echo `date +"%Y-%m-%d %H:%M:%S"` " - blackfire extension deactivation." - rm -f /usr/local/etc/php/conf.d/zz-blackfire.ini -fi - rm -rf bin/run-worker.sh if [ ! -z "$PHRASEANET_SCHEDULER" ] ; then @@ -123,6 +113,7 @@ else fi done + echo $NBR_WORKERS " workers defined" echo $NBR_WORKERS > bin/workers_count.txt chown root:app bin/workers_count.txt From fdef197150740e3633a37e29acc3abea2c7d451b Mon Sep 17 00:00:00 2001 From: nmaillat Date: Tue, 12 Dec 2023 11:23:11 +0100 Subject: [PATCH 2/4] wip --- .env | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.env b/.env index c85e3e571a..9a3df0ba62 100644 --- a/.env +++ b/.env @@ -134,7 +134,7 @@ PHRASEANET_DOCKER_REGISTRY=local # Docker images tag. # @run -PHRASEANET_DOCKER_TAG=4.1.8-rc7 +PHRASEANET_DOCKER_TAG=4.1.8-rc8 # Stack Name # An optionnal Name for the stack @@ -897,23 +897,6 @@ NEWRELIC_LICENSE_KEY= # @run NEWRELIC_APP_NAME= - - -# --- Blackfire settings ----------------------------------------------------------------------------------------------- - -# In developpement mode, Enable (or not) the "Blackfire" agent for -# plateform monitoring. -# @run -BLACKFIRE_ENABLED=false - -# @run -BLACKFIRE_SERVER_ID= - -# @run -BLACKFIRE_SERVER_TOKEN= - - - # --- Development purpose ---------------------------------------------------------------------------------------------- # See [Phraseanet development-mode documentation| From f7263fcb87ee20e8454fe54676c5e40acc936ba6 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 13 Dec 2023 00:11:41 +0100 Subject: [PATCH 3/4] cmd container wip --- .env | 15 +++++---- docker-compose.override.yml | 7 ++++ docker-compose.yml | 44 +++++++++++++++++++++++++- docker/phraseanet/fpm/entrypoint.sh | 11 ------- docker/phraseanet/worker/entrypoint.sh | 5 +++ 5 files changed, 64 insertions(+), 18 deletions(-) diff --git a/.env b/.env index 9a3df0ba62..a4f1032e79 100644 --- a/.env +++ b/.env @@ -44,8 +44,9 @@ # - "gateway-traefik" : nginx is launched behind a traefik service, the traefik is include in this stack (todo) # or Traefik include in Phrasea Stack. # - "workers" : launch one worker container by kind of Jobs, you can also -# choose to launch only some workers, see worker list below. +# 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" : launch a mariadb container, because this is the primary # datastore for production usage, use your own service. # - "elastisearch" : launch a elasticsearch container. @@ -89,11 +90,11 @@ # # For development: # - 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 +# - COMPOSE_PROFILES=app,setup,db,pma,elasticsearch,redis,redis-session,rabbitmq,workers,mailhog,builder,gateway-classic,cmd # # 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 +# - COMPOSE_PROFILES=app,setup,db,pma,elasticsearch,rabbitmq,redis,redis-session,workers,,cmd,mailhog,gateway-classic # # For testing with debug and SSL (the traekik is provide by Phrasea stack): # - COMPOSE_FILE=docker-compose.yml:docker-compose.datastores.yml:docker-compose.tools.yml:docker-compose.under-phrasea.yml @@ -107,7 +108,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,downloadAsync,exposeUpload,exportFtp,mainQueue,populateIndex,pullAssets,recordsActions,subdefCreation, -# validationReminder,webhook,writeMetadatas,shareBasket,scheduler,elk,db-backup,phraseanet-saml-sp +# validationReminder,webhook,writeMetadatas,shareBasket,scheduler,cmd,elk,db-backup,phraseanet-saml-sp # @@ -134,7 +135,7 @@ PHRASEANET_DOCKER_REGISTRY=local # Docker images tag. # @run -PHRASEANET_DOCKER_TAG=4.1.8-rc8 +PHRASEANET_DOCKER_TAG=4.1.8-rc7 # Stack Name # An optionnal Name for the stack @@ -772,7 +773,9 @@ PHRASEANET_WORKER_writeMetadatas=1 # @run PHRASEANET_WORKER_shareBasket=1 - +# PHRASEANET_CMD_MODE=1, set a worker container for run bin/console... or bin/maintenance... manualy +# @run +PHRASEANET_CMD_MODE # --- Phraseanet Locales settings -------------------------------------------------------------------------------------- diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 3c7cbe351a..8ee6014401 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -189,6 +189,13 @@ services: - internal scheduler: + volumes: + - ../:/var/alchemy + - .:/var/alchemy/Phraseanet + networks: + - internal + + cmd: volumes: - ../:/var/alchemy - .:/var/alchemy/Phraseanet diff --git a/docker-compose.yml b/docker-compose.yml index b6f511b46a..ef11c4c3a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -302,7 +302,6 @@ services: - LC_NAME=C.UTF-8 - PHRASEANET_EXPLODE_WORKER - PHRASEANET_WORKERS_LAUNCH_METHOD - - PHRASEANET_WORKER_CUSTOM - PHRASEANET_WORKER_assetsIngest - PHRASEANET_WORKER_createRecord - PHRASEANET_WORKER_deleteRecord @@ -1314,6 +1313,49 @@ services: - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw networks: - internal + + cmd: + build: + context: . + target: phraseanet-worker + args: + - SSH_PRIVATE_KEY=${PHRASEANET_SSH_PRIVATE_KEY} + - PHRASEANET_PLUGINS=${PHRASEANET_PLUGINS} + image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-worker:$PHRASEANET_DOCKER_TAG + profiles: ["cmd"] + restart: on-failure + depends_on: + - phraseanet + environment: + - STACK_NAME + - 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 + - LANG=C.UTF-8 + - LC_MEASUREMENT=C.UTF-8 + - LC_CTYPE=C.UTF-8 + - LC_TIME=C.UTF-8 + - LC_NAME=C.UTF-8 + - PHRASEANET_CMD_MODE + - PHRASEANET_EXPLODE_WORKER + - PHRASEANET_WORKERS_LAUNCH_METHOD + - NEWRELIC_ENABLED + - NEWRELIC_LICENSE_KEY + - NEWRELIC_APP_NAME + volumes: + - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw + - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw + - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw + - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw + - ${PHRASEANET_CUSTOM_DIR}:/var/alchemy/Phraseanet/www/custom:rw + - ${PHRASEANET_CACHE_DIR}:/var/alchemy/Phraseanet/cache:rw + - ${PHRASEANET_TMP_DIR}:/var/alchemy/Phraseanet/tmp:rw + networks: + - internal volumes: diff --git a/docker/phraseanet/fpm/entrypoint.sh b/docker/phraseanet/fpm/entrypoint.sh index 6a5ab9b767..b14b8f917f 100755 --- a/docker/phraseanet/fpm/entrypoint.sh +++ b/docker/phraseanet/fpm/entrypoint.sh @@ -30,17 +30,6 @@ else rm -f /usr/local/etc/php/conf.d/newrelic.ini fi -if [[ $BLACKFIRE_ENABLED = "true" ]]; then - echo `date +"%Y-%m-%d %H:%M:%S"` " - BlackFire setup." - blackfire-agent --register --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN - service blackfire-agent start - echo "Blackfire setup done" -else - echo `date +"%Y-%m-%d %H:%M:%S"` " - blackfire extension deactivation." - rm -f /usr/local/etc/php/conf.d/zz-blackfire.ini -fi - - ./docker/phraseanet/plugins/console init chown -R app:app cache diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index af441aabb5..5722e3a817 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -113,6 +113,11 @@ else fi done + if [ ! -z "$PHRASEANET_CMD_MODE" ] && [ ${PHRASEANET_CMD_MODE} == "1" ] ; then + apt update + apt install screen + echo "Worker are in custom process mode" + fi echo $NBR_WORKERS " workers defined" echo $NBR_WORKERS > bin/workers_count.txt From 3dff96575cd83da048a8c957cd5f9c9ba587db49 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 13 Dec 2023 00:15:25 +0100 Subject: [PATCH 4/4] cmd container wip --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index a4f1032e79..943d005343 100644 --- a/.env +++ b/.env @@ -46,7 +46,7 @@ # - "workers" : launch one worker container by kind of Jobs, you can also # 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. +# - "cmd" : launch a container based on worker image, useful for run cmd manualy. # - "db" : launch a mariadb container, because this is the primary # datastore for production usage, use your own service. # - "elastisearch" : launch a elasticsearch container. @@ -94,7 +94,7 @@ # # 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,workers,,cmd,mailhog,gateway-classic +# - COMPOSE_PROFILES=app,setup,db,pma,elasticsearch,rabbitmq,redis,redis-session,workers,cmd,mailhog,gateway-classic # # For testing with debug and SSL (the traekik is provide by Phrasea stack): # - COMPOSE_FILE=docker-compose.yml:docker-compose.datastores.yml:docker-compose.tools.yml:docker-compose.under-phrasea.yml