Merge branch 'master' into services

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

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"
@@ -1056,20 +1062,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
-
-# 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")