disinto-admin/disinto
1
0
Fork 0
Code Issues 14 Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix: FORGE_TOKEN_OVERRIDE in entrypoint-llama.sh is overwritten by env.sh sourcing .env (#375) #376

Merged
dev-bot merged 1 commit from fix/issue-375 into main 2026-04-07 18:39:02 +00:00
Conversation 2 Commits 1 Files changed 2 +8
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docker/agents/entrypoint-llama.sh
View file

@ -48,6 +48,7 @@ while true; do
su -s /bin/bash agent -c " su -s /bin/bash agent -c "
export FORGE_TOKEN='${FORGE_TOKEN}' export FORGE_TOKEN='${FORGE_TOKEN}'
export FORGE_TOKEN_OVERRIDE='${FORGE_TOKEN_OVERRIDE:-}'
export ANTHROPIC_API_KEY='${ANTHROPIC_API_KEY:-}' export ANTHROPIC_API_KEY='${ANTHROPIC_API_KEY:-}'
export ANTHROPIC_BASE_URL='${ANTHROPIC_BASE_URL:-}' export ANTHROPIC_BASE_URL='${ANTHROPIC_BASE_URL:-}'
export CLAUDE_CONFIG_DIR='${CLAUDE_CONFIG_DIR:-}' export CLAUDE_CONFIG_DIR='${CLAUDE_CONFIG_DIR:-}'

7
lib/env.sh
View file

@ -64,6 +64,13 @@ elif [ -f "$FACTORY_ROOT/.env" ]; then
[ -n "$_saved_forge_url" ] && export FORGE_URL="$_saved_forge_url" [ -n "$_saved_forge_url" ] && export FORGE_URL="$_saved_forge_url"
fi fi
# Allow per-container token override (#375): .env sets the default FORGE_TOKEN
# (dev-bot), then FORGE_TOKEN_OVERRIDE replaces it for containers that need a
# different Forgejo identity (e.g. dev-qwen).
if [ -n "${FORGE_TOKEN_OVERRIDE:-}" ]; then
export FORGE_TOKEN="$FORGE_TOKEN_OVERRIDE"
fi
# PATH: foundry, node, system # PATH: foundry, node, system
export PATH="${HOME}/.local/bin:${HOME}/.foundry/bin:${HOME}/.nvm/versions/node/v22.20.0/bin:/usr/local/bin:/usr/bin:/bin:${PATH}" export PATH="${HOME}/.local/bin:${HOME}/.foundry/bin:${HOME}/.nvm/versions/node/v22.20.0/bin:/usr/local/bin:/usr/bin:/bin:${PATH}"
export HOME="${HOME:-/home/debian}" export HOME="${HOME:-/home/debian}"