Skip to content

fix: add OSC_ENV derivation from OSC_MCP_URL and --env flag (#12) #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
birme merged 1 commit into from
May 11, 2026
+24 −3
Merged

fix: add OSC_ENV derivation from OSC_MCP_URL and --env flag (#12) #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 24 additions & 3 deletions scripts/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,30 @@ fi
cd /usercontent

# Load environment variables from config service if configured
if [ -n "$OSC_ACCESS_TOKEN" ] && [ -n "$CONFIG_SVC" ]; then
echo "Loading environment variables from application config service '$CONFIG_SVC'"
eval $(npx -y @osaas/cli@latest web config-to-env $CONFIG_SVC)
if [ -n "${OSC_ACCESS_TOKEN:-}" ] && [ -n "${CONFIG_SVC:-}" ]; then
# Derive OSC environment from OSC_MCP_URL if OSC_ENV is not set explicitly
if [[ -z "${OSC_ENV:-}" && -n "${OSC_MCP_URL:-}" ]]; then
_extracted=$(echo "$OSC_MCP_URL" | sed -n 's|.*\.svc\.\([a-z]*\)\.osaas\.io.*|\1|p')
OSC_ENV=${_extracted:-prod}
fi
# Token refresh block (matching birme/claude-runner#14)
REFRESH_RESULT=$(curl -sf -X POST \
"https://token.svc.${OSC_ENV:-prod}.osaas.io/runner-token/refresh" \
-H "x-pat-jwt: $OSC_ACCESS_TOKEN" 2>&1) && \
OSC_ACCESS_TOKEN=$(echo "$REFRESH_RESULT" | jq -r '.token // empty') || true
echo "[CONFIG] Loading environment variables from config service '$CONFIG_SVC'"
config_env_output=$(npx -y @osaas/cli@latest web config-to-env ${OSC_ENV:+--env "$OSC_ENV"} "$CONFIG_SVC" 2>&1)
config_exit=$?
if [ $config_exit -eq 0 ]; then
valid_exports=$(echo "$config_env_output" | grep "^export [A-Za-z_][A-Za-z0-9_]*=")
if [ -n "$valid_exports" ]; then
eval "$valid_exports"
var_count=$(echo "$valid_exports" | wc -l | tr -d ' ')
echo "[CONFIG] Loaded $var_count environment variable(s)"
fi
else
echo "[CONFIG] ERROR: Failed to load config (exit $config_exit): $config_env_output" >&2
fi
fi

# Install Python dependencies
Expand Down