nodeOci: move context to container specific path and fix blank arg bug w/ filteredOpts

Author: johnalotoski

nix/docker/context/bin/entrypoint renamed to nix/docker/context/node/bin/entrypoint

@@ -92,19 +92,18 @@ cat << EOF > /usr/local/bin/env
 #!/usr/bin/env bash
 
 # Docker run ENV vars
-CARDANO_CONFIG="$CARDANO_CONFIG"
-CARDANO_TOPOLOGY="$CARDANO_TOPOLOGY"
 CARDANO_BIND_ADDR="$CARDANO_BIND_ADDR"
-CARDANO_PORT=$CARDANO_PORT
+CARDANO_BLOCK_PRODUCER=$CARDANO_BLOCK_PRODUCER
+CARDANO_CONFIG="$CARDANO_CONFIG"
 CARDANO_DATABASE_PATH="$CARDANO_DATABASE_PATH"
-CARDANO_SOCKET_PATH="$CARDANO_SOCKET_PATH"
 CARDANO_LOG_DIR="$CARDANO_LOG_DIR"
+CARDANO_PORT=$CARDANO_PORT
+CARDANO_SOCKET_PATH="$CARDANO_SOCKET_PATH"
+CARDANO_TOPOLOGY="$CARDANO_TOPOLOGY"
 
 CARDANO_PUBLIC_IP="$CARDANO_PUBLIC_IP"
 CARDANO_CUSTOM_PEERS="$CARDANO_CUSTOM_PEERS"
 
-CARDANO_BLOCK_PRODUCER=$CARDANO_BLOCK_PRODUCER
-
 # Mapping for topologyUpdater
 CNODE_HOSTNAME="$CARDANO_PUBLIC_IP"
 CNODE_PORT=$CARDANO_PORT
@@ -135,7 +134,7 @@ runRelayNode () {
     "--port" "$CARDANO_PORT"
   )
 
-  effopts+=("${options[@]}")
+  effopts+=("${filteredOpts[@]}")
 
   echo "cardano-node run ${effopts[*]}"
   exec /usr/local/bin/cardano-node run "${effopts[@]}"
@@ -159,7 +158,7 @@ runBlockProducerNode () {
     "--shelley-operational-certificate" "$CARDANO_SHELLEY_OPERATIONAL_CERTIFICATE"
   )
 
-  effopts+=("${options[@]}")
+  effopts+=("${filteredOpts[@]}")
 
   echo "cardano-node run ${effopts[*]}"
   exec /usr/local/bin/cardano-node run "${effopts[@]}"
@@ -169,7 +168,6 @@ runBlockProducerNode () {
 shift
 
 # Override default values with explicit options
-
 options=("$@")
 
 for i in "${!options[@]}"
@@ -199,6 +197,9 @@ do
     fi
 done
 
+# Filter blank args from match removal above
+filteredOpts=(); for arg in "${options[@]}"; do [[ $arg ]] && filteredOpts+=("$arg"); done
+
 printRunEnv
 writeRootEnv
 

nix/docker/context/bin/run-client renamed to nix/docker/context/node/bin/run-client

@@ -93,7 +93,7 @@ let
   '';
 
   # The docker context with static content
-  context = ./context;
+  context = ./context/node;
 
   genCfgs = let
     environments' = lib.getAttrs [ "mainnet" "preprod" "preview" ] commonLib.environments;
@@ -113,7 +113,7 @@ let
         done
 
         # Adjust genesis file, config and config-bp refs
-        for i in config config-bp db-sync-config; do
+        for i in config config-bp config-legacy config-bp-legacy db-sync-config; do
           if [ -f "$out/config/$ENV/$i.json" ]; then
             sed -i "s|\"$ENV-|\"|g" "$out/config/$ENV/$i.json"
           fi