rccontrol: fixed env flags propagation to services

docker-compose-apps.yaml

@@ -23,6 +23,8 b' services:'
     stdin_open: true
     tty: true
     restart: always
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
       "/usr/local/bin/rhodecode_bin/bin/gunicorn",
       "--name=gunicorn-rhodecode-1",
@@ -106,6 +108,8 b' services:'
     stdin_open: true
     tty: true
     restart: always
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
        "/home/rhodecode/.rccontrol/vcsserver-1/profile/bin/gunicorn",
        "--name=gunicorn-vcsserver-1",
@@ -156,6 +160,8 b' services:'
     stdin_open: true
     tty: true
     restart: always
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
         "/usr/local/bin/rhodecode_bin/bin/celery",
         "worker",
@@ -202,6 +208,8 b' services:'
     stdin_open: true
     tty: true
     restart: always
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: [
       "/usr/local/bin/rhodecode_bin/bin/celery",
       "beat",
@@ -252,6 +260,8 b' services:'
     stdin_open: true
     tty: true
     restart: always
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: ["apachectl", "-D", "FOREGROUND"]
 
     environment:
@@ -289,6 +299,8 b' services:'
     stdin_open: true
     tty: true
     restart: always
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: ["/usr/sbin/sshd", "-f", "/etc/rhodecode/sshd_config", "-D", "-e"]
 
     environment:

docker-compose-services.yaml

@@ -42,7 +42,8 b' services:'
 
 #    ports:
 #      - "127.0.0.1:9800:9800"
-
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command: ["channelstream"]
 
     healthcheck:
@@ -75,6 +76,8 b' services:'
 
     environment:
       NGINX_ENTRYPOINT_QUIET_LOGS: 1
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
 
     healthcheck:
       # change port 80 to 443 when only using SSL
@@ -113,6 +116,8 b' services:'
       - bootstrap.memory_lock=true
       - discovery.type=single-node
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     healthcheck:
       # change port 80 to 443 when only using SSL
       test: [ "CMD", "curl", "-A", "RhodeCode-Healthcheck", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "elasticsearch:9200/_cat/health" ]
@@ -140,7 +145,8 b' services:'
     image: library/redis:7.0.5
 
     restart: always
-
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
     command:
       - "redis-server"
       - "/etc/redis/redis.conf"
@@ -177,6 +183,8 b' services:'
       POSTGRES_PASSWORD: ${DB_PASSWORD:?must-specify-db-password}
       POSTGRES_HOST_AUTH_METHOD: md5
       POSTGRES_INITDB_ARGS: "--auth-host=md5 --auth-local=md5"
+    env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
 
     restart: always
     command:
@@ -219,6 +227,8 b' services:'
         MYSQL_USER: ${DB_USER:?must-specify-db-user}
         MYSQL_PASSWORD: ${DB_PASSWORD:?must-specify-db-password}
         MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:?must-specify-db-password}
+      env_file:
+        - ${RC_ENV_FILE:?must-specify-rc-env-file}
 
       restart: always
 

scripts/rccontrol/rccontrol

@@ -1824,7 +1824,7 b' rccontrol_stack_router_command() {'
   fi
 
   CMD_ROUTER="\
-  docker compose \
+  RC_ENV_FILE=$ENV_FILE docker compose \
   --env-file $ENV_FILE \
   $ENV_EXPAND \
   -p rc_cluster_router \
@@ -1857,7 +1857,7 b' rccontrol_stack_metrics_command() {'
   fi
 
   CMD_METRICS="\
-  docker compose \
+  RC_ENV_FILE=$ENV_FILE docker compose \
   --env-file $ENV_FILE \
   $ENV_EXPAND \
   -p rc_cluster_metrics \
@@ -1891,7 +1891,7 b' rccontrol_stack_services_command() {'
   RC_STACK_PROFILES="--profile postgres --profile redis --profile elasticsearch --profile channelstream"
 
   CMD_SERVICES="\
-  docker compose \
+  RC_ENV_FILE=$ENV_FILE docker compose \
   --env-file $ENV_FILE \
   $ENV_EXPAND \
   $RC_STACK_PROFILES \
@@ -1925,7 +1925,7 b' rccontrol_stack_rhodecode_command() {'
   fi
 
   CMD_RHODECODE="\
-  docker compose \
+  RC_ENV_FILE=$ENV_FILE docker compose \
   --env-file $ENV_FILE \
   $ENV_EXPAND \
   -p rc_cluster_apps \
@@ -1933,7 +1933,7 b' rccontrol_stack_rhodecode_command() {'
   -f docker-compose-apps.yaml $RC_STACK_RHODECODE_EXT_LCL"
 
   CMD_RHODECODE_SOURCE="\
-  docker compose \
+  RC_ENV_FILE=$ENV_FILE docker compose \
   --env-file $ENV_FILE \
   $ENV_EXPAND \
   -p rc_cluster_apps \