Small improvements

interuss · Jul 7, 2023 · dbc24e0 · dbc24e0
1 parent 1816a62
commit dbc24e0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/monitoring/mock_uss/run_locally_riddp.sh b/monitoring/mock_uss/run_locally_riddp.sh
@@ -13,6 +13,7 @@ AUD=${MOCK_USS_TOKEN_AUDIENCE:-localhost,host.docker.internal}
 CONTAINER_NAME=${MOCK_CONTAINER_NAME:-"mock_uss_riddp"}
 
 PORT=${PORT:-8073}
+BASE_URL="http://${MOCK_USS_TOKEN_AUDIENCE:-host.docker.internal}:${PORT}"
 
 if [ "$CI" == "true" ]; then
   docker_args="--add-host host.docker.internal:host-gateway" # Required to reach other containers in Ubuntu (used for Github Actions)
@@ -26,6 +27,7 @@ docker container rm -f "${CONTAINER_NAME}" || echo "No pre-existing ${CONTAINER_
 docker run ${docker_args} --name "${CONTAINER_NAME}" \
   -e MOCK_USS_AUTH_SPEC="${AUTH}" \
   -e MOCK_USS_DSS_URL="${DSS}" \
+  -e MOCK_USS_BASE_URL="${BASE_URL}" \
   -e MOCK_USS_PUBLIC_KEY="${PUBLIC_KEY}" \
   -e MOCK_USS_TOKEN_AUDIENCE="${AUD}" \
   -e MOCK_USS_SERVICES="riddp" \

diff --git a/monitoring/mock_uss/start_all_local_mocks.sh b/monitoring/mock_uss/start_all_local_mocks.sh
@@ -18,7 +18,6 @@ monitoring/mock_uss/run_locally_ridsp_v22a.sh -d
 monitoring/mock_uss/run_locally_riddp_v22a.sh -d
 monitoring/mock_uss/run_locally_geoawareness.sh -d
 monitoring/mock_uss/run_locally_atproxy_client.sh -d
-monitoring/mock_uss/run_locally_tracer.sh -d
 monitoring/mock_uss/run_locally_tracer_v22a.sh -d
 monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_scdsc
 monitoring/mock_uss/wait_for_mock_uss.sh mock_uss_ridsp_v22a

diff --git a/monitoring/mock_uss/stop_all_local_mocks.sh b/monitoring/mock_uss/stop_all_local_mocks.sh
@@ -10,4 +10,4 @@ else
 fi
 cd "${BASEDIR}/../.." || exit 1
 
-docker container rm -f mock_uss_scdsc mock_uss_ridsp mock_uss_ridsp_v22a mock_uss_riddp mock_uss_riddp_v22a mock_uss_geoawareness mock_uss_atproxy_client mock_uss_tracer
+docker container rm -f mock_uss_scdsc mock_uss_ridsp_v22a mock_uss_riddp_v22a mock_uss_geoawareness mock_uss_atproxy_client mock_uss_tracer_v22a