compose: freeze to 4.28.0 default version if not given.

- also remove .env file as we really only with generated one from now one
- small update to provide env_file to be replaced by --env option

README.md

@@ -15,7 +15,7 b' Core Services:'
  - Database (defaults to PostgreSQL)
  - Redis, acts as cache and queue exchange
  - ChannelStream - live websocket communications
- - Nginx (static/channelstream) proxy serving RhodeCode APPS and channelstream communication
+ - Nginx (static/channelstream) proxy serving RhodeCode static files and channelstream communication
  - Elasticsearch (full text search backend)
 
 RhodeCode
@@ -30,17 +30,17 b' RhodeCode'
 Metrics
 
  - Loki, logs aggregation
- - Grafana, Metrics Dashboard
- - Promethues, Metrics time-series
- - statsd-exporter - statsd to promethues bridge
- - node-exporter - machine stats
- - promtail - log scraping
+ - Grafana, metrics Dashboard
+ - Prometheus, metrics time-series
+ - Statsd-exporter - statsd to Prometheus bridge
+ - Node-exporter - machine stats and usage
+ - Promtail - log scraping
 
 
 ## Pre requisites
 
 To Run this stack Docker engine and Docker Compose needs to be installed on the host machine.
-Please run ./rccontrol init to install docker using the installer, or 
+Please run `./rccontrol init` to install docker using the installer, or 
 visit docker site and install docker (min version 20.10) and docker compose:
 
 - https://docs.docker.com/engine/install/

docker-compose-apps.source.yaml

@@ -16,7 +16,7 b' services:'
       context: .
       dockerfile: service/rhodecode/rhodecode_source.dockerfile
 
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}_SOURCE
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
 
   vcsserver:
     environment:
@@ -29,7 +29,7 b' services:'
       context: .
       dockerfile: service/rhodecode/rhodecode_source.dockerfile
 
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}_SOURCE
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
 
   celery:
 
@@ -37,7 +37,7 b' services:'
       context: .
       dockerfile: service/rhodecode/rhodecode_source.dockerfile
 
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}_SOURCE
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
 
   celery-beat:
 
@@ -45,7 +45,7 b' services:'
       context: .
       dockerfile: service/rhodecode/rhodecode_source.dockerfile
 
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}_SOURCE
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
 
   svn:
 
@@ -53,7 +53,7 b' services:'
       context: .
       dockerfile: service/rhodecode/rhodecode_source.dockerfile
 
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}_SOURCE
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
 
   sshd:
 
@@ -61,4 +61,4 b' services:'
       context: .
       dockerfile: service/rhodecode/rhodecode_source.dockerfile
 
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}_SOURCE
  No newline at end of file
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}_SOURCE
  No newline at end of file

docker-compose-apps.yaml

@@ -17,9 +17,7 b' services:'
   rhodecode:
     networks:
       - rhodecode_network
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}
-    env_file:
-      - .custom/.runtime.env
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
     stdin_open: true
     tty: true
     restart: always
@@ -42,7 +40,7 b' services:'
       dockerfile: service/rhodecode/rhodecode.dockerfile
       args:
         TZ: ${TZ}
-        RHODECODE_VERSION: ${RC_VERSION:?specify-RC_VERSION-env-var}
+        RHODECODE_VERSION: ${RC_VERSION:-4.28.0}
         RHODECODE_DB: postgresql://rhodecode:${DB_PASSWORD:?must-specify-db-password}@database/${DB_NAME:?must-specify-db-name}
         RHODECODE_USER_NAME: ${RHODECODE_USER_NAME}
         RHODECODE_USER_PASS: ${RHODECODE_USER_PASS}
@@ -99,9 +97,8 b' services:'
   vcsserver:
     networks:
       - rhodecode_network
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}
-    env_file:
-      - .custom/.runtime.env
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
+
     stdin_open: true
     tty: true
     restart: always
@@ -148,9 +145,8 b' services:'
   celery:
     networks:
       - rhodecode_network
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}
-    env_file:
-      - .custom/.runtime.env
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
+
     stdin_open: true
     tty: true
     restart: always
@@ -193,9 +189,8 b' services:'
     # This service is not scalable
     networks:
       - rhodecode_network
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}
-    env_file:
-      - .custom/.runtime.env
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
+
     stdin_open: true
     tty: true
     restart: always
@@ -236,9 +231,7 b' services:'
   svn:
     networks:
       - rhodecode_network
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}
-    env_file:
-      - .custom/.runtime.env
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
 
 #    build:
 #      context: .
@@ -279,9 +272,7 b' services:'
   sshd:
     networks:
       - rhodecode_network
-    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:?specify-RC_VERSION-env-var}
-    env_file:
-      - .custom/.runtime.env
+    image: rhodecode/rhodecode-${RC_EDITION}:${RC_VERSION:-4.28.0}
 
     stdin_open: true
     tty: true

docker-compose-router.yaml

@@ -25,9 +25,6 b' services:'
       - "443:443"
       # The SSH port
       - "${RC_SSH_PORT}:${RC_SSH_PORT}"
-      # The Web UI (enabled by --api.insecure=true)
-      # uncomment to expose dashboard at port :7000
-      #- "7000:7000"
     volumes:
       # So that Traefik can listen to the Docker events
       - /var/run/docker.sock:/var/run/docker.sock

docker-compose-services.yaml

@@ -45,9 +45,6 b' services:'
 
     command: ["channelstream"]
 
-    env_file:
-      - .custom/.runtime.env
-
     healthcheck:
         test: [ "CMD", "curl", "-s", "-o", "/dev/null", "-w", "'%{http_code}'", "http://channelstream:8000/admin/sign_in" ]
         timeout: 5s
@@ -143,11 +140,12 b' services:'
     image: library/redis:7.0.5
 
     restart: always
+
     command:
       - "redis-server"
       - "/etc/redis/redis.conf"
       - "--maxmemory-policy allkeys-lru"
-      - "--maxmemory ${RC_REDIS_MAXMEMORY}"
+      - "--maxmemory ${RC_REDIS_MAXMEMORY:?must-specify-redis-maxmemory}"
 
 #    ports:
 #      - "127.0.0.1::6379"

scripts/rccontrol/rccontrol

@@ -80,6 +80,12 b' rccontrol_usage() {'
     printf "Environment Variables:\n"
 
     # :environment_variable.usage
+    echo "  RCC_CONFIG"
+    printf "    default config file for rccontrol\n"
+    printf "    Default: .rccontrol.ini\n"
+    echo
+
+    # :environment_variable.usage
     echo "  AUTH_TOKEN"
     printf "    Set your RhodeCode AUTH Token\n"
     echo
@@ -414,7 +420,7 b' rccontrol_stack_usage() {'
   fi
 
   printf "Usage:\n"
-  printf "  rccontrol stack COMMAND\n"
+  printf "  rccontrol stack [OPTIONS] COMMAND\n"
   printf "  rccontrol stack [COMMAND] --help | -h\n"
   echo
   # :command.usage_commands
@@ -435,6 +441,13 b' rccontrol_stack_usage() {'
     printf "    Show this help\n"
     echo
 
+    # :command.usage_flags
+    # :flag.usage
+    echo "  --env-file-path ENV_FILE_PATH"
+    printf "    Set custom env file\n"
+    printf "    Default: $PWD/.custom/.runtime.env\n"
+    echo
+
     # :command.usage_examples
     printf "Examples:\n"
     printf "  - ./rccontrol stack router up          # run router stack with output to\n  console\n  - ./rccontrol stack router up --detach # run router stack detached\n  - ./rccontrol stack router down        # stop whole router stack\n  - ./rccontrol stack router ps          # check status of router stack\n  - ./rccontrol stack router -f docker-overrides.yaml up -d # run router stack\n  with your overrides\n"
@@ -1024,7 +1037,7 b' cyan_underlined() { print_in_color "\\e[4;36m" "$*"; }'
 
 # src/lib/config.sh
 config_init() {
-  CONFIG_FILE=${CONFIG_FILE:=config.ini}
+  CONFIG_FILE=${CONFIG_FILE:=.rccontrol.ini}
   [[ -f "$CONFIG_FILE" ]] || touch "$CONFIG_FILE"
 }
 
@@ -1350,7 +1363,6 b' rccontrol_bootstrap_command() {'
 
     DEFINITIONS_EXIST=""
     CHECK_FILES="\
-    .env \
     docker-compose-services.yaml \
     docker-compose-apps.yaml \
     docker-compose-metrics.yaml \
@@ -1592,6 +1604,7 b' rccontrol_stack_router_command() {'
   check_bootstrap
 
   DEBUG=${args[--debug]}
+  ENV_FILE=${args[--env-file-path]}
 
   if [[ ! -f $RC_STACK_ROUTER_EXT ]]; then
     RC_STACK_ROUTER_EXT=""
@@ -1624,6 +1637,7 b' rccontrol_stack_metrics_command() {'
   check_bootstrap
 
   DEBUG=${args[--debug]}
+  ENV_FILE=${args[--env-file-path]}
 
   if [[ ! -f $RC_STACK_METRICS_EXT ]]; then
     RC_STACK_METRICS_EXT_LCL=""
@@ -1655,6 +1669,7 b' rccontrol_stack_services_command() {'
   check_bootstrap
 
   DEBUG=${args[--debug]}
+  ENV_FILE=${args[--env-file-path]}
 
   if [[ ! -f $RC_STACK_SERVICES_EXT ]]; then
     RC_STACK_SERVICES_EXT_LCL=""
@@ -1690,6 +1705,7 b' rccontrol_stack_rhodecode_command() {'
   check_bootstrap
 
   DEBUG=${args[--debug]}
+  ENV_FILE=${args[--env-file-path]}
 
   if [[ ! -f $RC_STACK_RHODECODE_EXT ]]; then
     RC_STACK_RHODECODE_EXT_LCL=""
@@ -1870,6 +1886,7 b' rccontrol_cli_storage_command() {'
   check_bootstrap
 
   DEBUG=${args[--debug]}
+  ENV_FILE=${args[--env-file-path]}
 
   source $ENV_FILE
   target_container=$RC_IMAGE_EE
@@ -2006,6 +2023,7 b' parse_requirements() {'
 
   # :command.environment_variables_filter
   # :command.environment_variables_default
+  export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
   export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.27.0}"
   export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
   export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
@@ -2637,6 +2655,21 b' rccontrol_stack_parse_requirements() {'
     exit
     ;;
 
+  # :flag.case
+  --env-file-path )
+
+    # :flag.case_arg
+    if [[ -n ${2+x} ]]; then
+
+      args[--env-file-path]="$2"
+      shift
+      shift
+    else
+      printf "%s\n" "--env-file-path requires an argument: --env-file-path ENV_FILE_PATH" >&2
+      exit 1
+    fi
+    ;;
+
   esac
 
   # :command.command_filter
@@ -2715,6 +2748,9 b' rccontrol_stack_parse_requirements() {'
     esac
   done
 
+  # :command.default_assignments
+  [[ -n ${args[--env-file-path]:-} ]] || args[--env-file-path]="$PWD/.custom/.runtime.env"
+
 }
 
 # :command.parse_requirements
@@ -3355,6 +3391,7 b' initialize() {'
   set -e
 
   # :command.environment_variables_default
+  export RCC_CONFIG="${RCC_CONFIG:-.rccontrol.ini}"
   export RC_CLI_VERSION_NAME="${RC_CLI_VERSION_NAME:-4.27.0}"
   export RC_STACK_ROUTER_EXT="${RC_STACK_ROUTER_EXT:-.custom/docker-compose-router.override.yaml}"
   export RC_STACK_METRICS_EXT="${RC_STACK_METRICS_EXT:-.custom/docker-compose-metrics.override.yaml}"
@@ -3363,10 +3400,8 b' initialize() {'
 
   # src/initialize.sh
 
-  ENV_FILE=$PWD/.env
-
   # bootstrap file is a config file at the same time
-  CONFIG_FILE='.rccontrol.ini'
+  CONFIG_FILE=${RCC_CONFIG:=.rccontrol.ini}
 
   # STACK_LIST
   VALID_SERVICES="router metrics services rhodecode"

templates/docker-compose-apps.override.yaml

@@ -13,8 +13,10 b' services:'
       replicas: 1
 
   vcsserver:
+
     environment:
       {}
+
     deploy:
       replicas: 1
 

templates/docker-compose-metrics.override.yaml

@@ -6,8 +6,9 b' services:'
     {}
 
   loki:
-    labels:
-      - "traefik.enable=false"
+    {}
+#    labels:
+#      - "traefik.enable=true"
 #      - "traefik.http.services.loki.loadbalancer.server.port=3100"
 #      - "traefik.http.services.loki.loadbalancer.server.port=9095"
 

templates/docker-compose-router.override.yaml

@@ -4,11 +4,16 b" version: '3.9'"
 services:
 
   traefik:
-
+#    ports:
+#      # The Web UI (enabled by --api.insecure=true)
+#      # uncomment to expose dashboard at port :7000,
+#      # this is mostly for debugging routes and services
+#      - "7000:7000"
     volumes:
       # So that Traefik can listen to the Docker events
       - /var/run/docker.sock:/var/run/docker.sock
       # custom traefik config, enable SSL etc..
+      # put your traefik setup in this directory
       - $PWD/.custom/traefik_custom:/etc/traefik
 
   portainer: