DO-2284 / add nginx repo override (#119)

* add nginx repo override * fix actionlint
radixdlt · Mar 26, 2024 · 4213783 · 4213783
1 parent 961d874
commit 4213783
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 104 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -336,9 +336,7 @@ jobs:
         run: |
           ls -a
           chmod +x ./babylonnode
-          mkdir -p $HOME/node-config
-          echo "HOME=$HOME"
-          echo "PATH=$PWD"
+          mkdir -p "$HOME/node-config"
           export PROMPT_FEEDS="node-runner-cli/test-prompts/core-gateway-all-local.yml"
           ./babylonnode docker config -m DETAILED \
            -d $HOME/node-config \
@@ -352,7 +350,7 @@ jobs:
           chmod +x ./babylonnode
           export PROMPT_FEEDS="node-runner-cli/test-prompts/corenode-01.yml"
           ./babylonnode docker config -m DETAILED \
-           -d $HOME/node-config \
+           -d "$HOME/node-config" \
            -k $KEYSTORE_PASSWORD -nk -a
         env:
           KEYSTORE_PASSWORD: ${{secrets.KEYSTORE_PASSWORD}}
@@ -362,8 +360,8 @@ jobs:
           ls -a
           export PROMPT_FEEDS="node-runner-cli/test-prompts/corenode-02.yml"
           ./babylonnode docker config -m DETAILED \
-           -d $HOME/node-config \
-           -k $KEYSTORE_PASSWORD -nk -a
+           -d "$HOME/node-config" \
+           -k "$KEYSTORE_PASSWORD" -nk -a
         env:
           KEYSTORE_PASSWORD: ${{secrets.KEYSTORE_PASSWORD}}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -372,17 +370,17 @@ jobs:
           ls -a
           export PROMPT_FEEDS="node-runner-cli/test-prompts/gateway-remote-core-local-postgress.yml"
           ./babylonnode docker config -m DETAILED \
-           -d $HOME/node-config \
-           -k $KEYSTORE_PASSWORD -nk -a
+           -d "$HOME/node-config" \
+           -k "$KEYSTORE_PASSWORD" -nk -a
         env:
           KEYSTORE_PASSWORD: ${{secrets.KEYSTORE_PASSWORD}}
       - name: gateway-remote-core-remote-postgress
         run: |
           ls -a
           export PROMPT_FEEDS="node-runner-cli/test-prompts/gateway-remote-core-remote-postgress.yml"
           ./babylonnode docker config -m DETAILED \
-           -d $HOME/node-config \
-           -k $KEYSTORE_PASSWORD -nk -a
+           -d "$HOME/node-config" \
+           -k "$KEYSTORE_PASSWORD" -nk -a
         env:
           KEYSTORE_PASSWORD: ${{secrets.KEYSTORE_PASSWORD}}
 
@@ -484,29 +482,28 @@ jobs:
       - name: Setup config
         run: |
           chmod +x ./babylonnode
-          mkdir -p $HOME/babylon-node-config
+          mkdir -p "$HOME/babylon-node-config"
           export DISABLE_VERSION_CHECK=true
           export RADIXDLT_APP_VERSION_OVERRIDE="rcnet-v2-phase2-r4"
           export DOCKER_COMPOSE_LOCATION="/usr/local/bin/docker-compose"
           export PROMPT_FEEDS="node-runner-cli/test-prompts/core-gateway-all-local.yml"
           ./babylonnode docker config -m DETAILED \
-            -d $HOME/babylon-node-config \
-            -k $KEYSTORE_PASSWORD -nk -a
+            -d "$HOME/babylon-node-config" \
+            -k "$KEYSTORE_PASSWORD" -nk -a
         env:
           KEYSTORE_PASSWORD: ${{secrets.KEYSTORE_PASSWORD}}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Run CLI setup
         run: |
           export DISABLE_VERSION_CHECK=true
           export DOCKER_COMPOSE_LOCATION="/usr/local/bin/docker-compose"
-          ./babylonnode docker install -f $HOME/babylon-node-config/config.yaml -a
-          # ToDo: Fix Authorization error export DOCKER_COMPOSE_FOLDER_PREFIX=runner ?
+          ./babylonnode docker install -f "$HOME/babylon-node-config/config.yaml" -a
           sleep 60
-          ./babylonnode auth set-admin-password -m DOCKER -p $NGINX_ADMIN_PASSWORD
-          ./babylonnode auth set-metrics-password -m DOCKER -p $NGINX_METRICS_PASSWORD
-          ./babylonnode auth set-superadmin-password -m DOCKER -p $NGINX_SUPERADMIN_PASSWORD
-          NGINX_ADMIN_PASSWORD=$NGINX_ADMIN_PASSWORD ./babylonnode api system health
-          NGINX_ADMIN_PASSWORD=$NGINX_ADMIN_PASSWORD ./babylonnode api system version
+          ./babylonnode auth set-admin-password -m DOCKER -p "$NGINX_ADMIN_PASSWORD"
+          ./babylonnode auth set-metrics-password -m DOCKER -p "$NGINX_METRICS_PASSWORD"
+          ./babylonnode auth set-superadmin-password -m DOCKER -p "$NGINX_SUPERADMIN_PASSWORD"
+          NGINX_ADMIN_PASSWORD="$NGINX_ADMIN_PASSWORD" ./babylonnode api system health
+          NGINX_ADMIN_PASSWORD="$NGINX_ADMIN_PASSWORD" ./babylonnode api system version
         env:
           NGINX_ADMIN_PASSWORD: ${{secrets.NGINX_ADMIN_PASSWORD}}
           NGINX_METRICS_PASSWORD: ${{secrets.NGINX_METRICS_PASSWORD}}

diff --git a/.github/workflows/remote-trigger.yml b/.github/workflows/remote-trigger.yml
diff --git a/node-runner-cli/config/EnvVars.py b/node-runner-cli/config/EnvVars.py
@@ -20,6 +20,7 @@
 SUPPRESS_API_COMMAND_WARN = "SUPPRESS_API_COMMAND_WARN"
 PROMPT_FEEDS = "PROMPT_FEEDS"
 CORE_DOCKER_REPO_OVERRIDE = "CORE_DOCKER_REPO_OVERRIDE"
+NGINX_DOCKER_REPO_OVERRIDE = "NGINX_DOCKER_REPO_OVERRIDE"
 GATEWAY_DOCKER_REPO_OVERRIDE = "GATEWAY_DOCKER_REPO_OVERRIDE"
 AGGREGATOR_DOCKER_REPO_OVERRIDE = "AGGREGATOR_DOCKER_REPO_OVERRIDE"
 MIGRATION_DOCKER_REPO_OVERRIDE = "MIGRATION_DOCKER_REPO_OVERRIDE"

diff --git a/node-runner-cli/config/Nginx.py b/node-runner-cli/config/Nginx.py
@@ -1,7 +1,7 @@
 import os
 
 from config.BaseConfig import BaseConfig
-from config.EnvVars import NGINX_BINARY_OVERIDE
+from config.EnvVars import NGINX_DOCKER_REPO_OVERRIDE, NGINX_BINARY_OVERIDE
 
 
 class DockerNginxConfig(BaseConfig):
@@ -13,7 +13,7 @@ def __init__(self, config_dict: dict):
         self.gateway_behind_auth: str = "true"
         self.protect_core: str = "true"
         self.release = ""
-        self.repo = "radixdlt/babylon-nginx"
+        self.repo: str = os.getenv(NGINX_DOCKER_REPO_OVERRIDE, "radixdlt/babylon-nginx")
         self.mode = "docker"
         super().__init__(config_dict)