Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \

RUN pip install gradio

# Version of @osaas/cli that docker-entrypoint.sh runs via npx. This is the
# single place the version is pinned; bump it here.
ENV OSAAS_CLI_VERSION=4.35.0
WORKDIR /runner
COPY ./scripts ./
RUN chmod +x ./*.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ if [ -n "${OSC_ACCESS_TOKEN:-}" ] && [ -n "${CONFIG_SVC:-}" ]; then
# without its environment variables. This runner has no loading server, so
# (like the setup.sh timeout below) failure is a non-zero exit.
config_err_file=$(mktemp)
config_env_output=$(timeout 60s npx -y @osaas/cli@latest web config-to-env ${OSC_ENV:+--env "$OSC_ENV"} "$CONFIG_SVC" 2>"$config_err_file") && config_exit=0 || config_exit=$?
config_env_output=$(timeout 60s npx -y "@osaas/cli@${OSAAS_CLI_VERSION:?OSAAS_CLI_VERSION must be set (pinned in the Dockerfile)}" web config-to-env ${OSC_ENV:+--env "$OSC_ENV"} "$CONFIG_SVC" 2>"$config_err_file") && config_exit=0 || config_exit=$?
config_err_output=$(cat "$config_err_file" 2>/dev/null || true)
rm -f "$config_err_file"
config_failed=0
Expand Down
2 changes: 1 addition & 1 deletion tests/test-entrypoint-config-load-failure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ run_block() {
echo $?
}

ENVV=(OSC_ACCESS_TOKEN=tok CONFIG_SVC=store)
ENVV=(OSC_ACCESS_TOKEN=tok CONFIG_SVC=store OSAAS_CLI_VERSION=4.35.0)

# Failure paths: non-zero exit and never reach the next phase
rc=$(run_block timeout "${ENVV[@]}")
Expand Down
Loading