From da9c87d7a33bdbafa35829eb6e730ccfdf4f34a5 Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Thu, 31 Oct 2024 08:03:30 -0500
Subject: [PATCH 1/4] remove registry related environment variables from
 rickshaw-run container args

---
 bin/base | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bin/base b/bin/base
index 9010ca8..8044941 100644
--- a/bin/base
+++ b/bin/base
@@ -1067,9 +1067,6 @@ fi
 # this must be defined after the registry information is known
 container_rs_args=()
 container_rs_args+=("-i")
-container_rs_args+=("-e RS_REG_REPO=${CRUCIBLE_ENGINE_REPO}")
-container_rs_args+=("-e RS_REG_AUTH=${CRUCIBLE_ENGINE_REPO_AUTH_TOKEN}")
-container_rs_args+=("-e RS_REG_TLS_VERIFY=${CRUCIBLE_ENGINE_REPO_TLS_VERIFY}")
 container_rs_args+=("-e RS_EMAIL=$CRUCIBLE_EMAIL")
 container_rs_args+=("-e RS_NAME=\"$CRUCIBLE_NAME\"")
 container_rs_args+=("-e MULTIPLEX_HOME=${CRUCIBLE_HOME}/subprojects/core/multiplex")

From 737b08a10996511014453eaea45f13c5f2205a1e Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Thu, 31 Oct 2024 08:13:32 -0500
Subject: [PATCH 2/4] since rickshaw-run will open registries.json directly we
 no longer need to load these values

---
 bin/base | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/base b/bin/base
index 8044941..884e32a 100644
--- a/bin/base
+++ b/bin/base
@@ -1056,10 +1056,6 @@ if [ -e ${REGISTRIES_CFG} ]; then
             exit_error "${REGISTRIES_CFG} does not validate against ${REGISTRIES_CFG_SCHEMA}" ${RC}
         fi
     fi
-
-    CRUCIBLE_ENGINE_REPO=$(jq_query ${REGISTRIES_CFG} '.engines.public.url')
-    CRUCIBLE_ENGINE_REPO_AUTH_TOKEN=$(jq_query ${REGISTRIES_CFG} '.engines.public."push-token"')
-    CRUCIBLE_ENGINE_REPO_TLS_VERIFY=$(jq_query ${REGISTRIES_CFG} '.engines.public."tls-verify"')
 else
     exit_error "Could not locate ${REGISTRIES_CFG}"
 fi

From 643532a25ae3711d164de9e4fc4670840bf30f17 Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Thu, 31 Oct 2024 08:14:46 -0500
Subject: [PATCH 3/4] the definition of container_rs_args no longer needs to
 come after registries.json processing

- since it's not referencing variables defined by that processing
  anymore
---
 bin/base | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bin/base b/bin/base
index 884e32a..94957c2 100644
--- a/bin/base
+++ b/bin/base
@@ -942,6 +942,12 @@ container_opensearch_args+=("--mount=type=bind,source=${opensearch_dir}/,destina
 container_build_args=()
 container_build_args+=("--mount=type=bind,source=/var/lib/containers,destination=/var/lib/containers")
 
+container_rs_args=()
+container_rs_args+=("-i")
+container_rs_args+=("-e RS_EMAIL=$CRUCIBLE_EMAIL")
+container_rs_args+=("-e RS_NAME=\"$CRUCIBLE_NAME\"")
+container_rs_args+=("-e MULTIPLEX_HOME=${CRUCIBLE_HOME}/subprojects/core/multiplex")
+
 podman_pull="podman_wrapper pull"
 podman_stop="podman_wrapper stop"
 podman_rm="podman_wrapper rm"
@@ -1059,10 +1065,3 @@ if [ -e ${REGISTRIES_CFG} ]; then
 else
     exit_error "Could not locate ${REGISTRIES_CFG}"
 fi
-
-# this must be defined after the registry information is known
-container_rs_args=()
-container_rs_args+=("-i")
-container_rs_args+=("-e RS_EMAIL=$CRUCIBLE_EMAIL")
-container_rs_args+=("-e RS_NAME=\"$CRUCIBLE_NAME\"")
-container_rs_args+=("-e MULTIPLEX_HOME=${CRUCIBLE_HOME}/subprojects/core/multiplex")

From bca6f43418c5bdb3bfb15a2d3782b97a0a72e9d2 Mon Sep 17 00:00:00 2001
From: Karl Rister <krister@redhat.com>
Date: Thu, 31 Oct 2024 08:16:29 -0500
Subject: [PATCH 4/4] we no longer require the presence of the
 CRUCIBLE_ENGINE_REPO environment variable

---
 bin/_main | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/_main b/bin/_main
index d0451d3..b40d14a 100755
--- a/bin/_main
+++ b/bin/_main
@@ -280,10 +280,6 @@ elif [ "${1}" == "run" ]; then
 
     fi
 
-    if [ -z "${CRUCIBLE_ENGINE_REPO}" ]; then
-        exit_error "CRUCIBLE_ENGINE_REPO is not defined"
-    fi
-
     if [ -z "${CRUCIBLE_CONTROLLER_IMAGE}" ]; then
         exit_error "Exiting because CRUCIBLE_CONTROLLER_IMAGE is not defined"
     fi