Skip to content

fix(deploy): isolate tracked compose stack #57

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

Draft
FZR95 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(deploy): isolate tracked compose stack #57

Show file tree
Hide file tree
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
15 changes: 10 additions & 5 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,14 @@ jobs:
mkdir -p "$BASE_DIR"
# Clone without recursing first; nested submodule auth is configured below.
for i in 1 2 3; do git clone "$REPO_URL" "$REPO_DIR" && break || sleep 5; done
fi
cd "$REPO_DIR"
git remote set-url origin "$REPO_URL"
fi
cd "$REPO_DIR"
# Production deploys only the tracked TopicLab stack. In particular,
# do not auto-load stale server-local docker-compose.override files
# that can reintroduce the independently deployed WorldWeave services.
export COMPOSE_FILE="$REPO_DIR/docker-compose.yml"
echo "[deploy] Compose file: $COMPOSE_FILE (local overrides disabled)"
git remote set-url origin "$REPO_URL"
SUBMODULE_AUTH="${SUBMODULE_TOKEN:-$GITHUB_TOKEN}"
set_submodule_url() {
local name="$1"
Expand Down Expand Up @@ -164,8 +169,8 @@ jobs:
fi
exit 1
fi
docker compose down
docker compose up -d
docker compose down --remove-orphans
docker compose up -d --remove-orphans
for i in $(seq 1 30); do
if docker compose exec -T topiclab-backend python -c "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/api/v1/topiclink/health/ready', timeout=5)"; then
break
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/pages/__tests__/WorldWeaveProxyConfig.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ describe('WorldWeave nginx proxy config', () => {
expect(workflow).toContain('WORLDWEAVE_UPSTREAM=http://host\\.docker\\.internal')
expect(workflow).toContain('http://127.0.0.1/worldweave/')
expect(workflow).toContain('http://127.0.0.1/info/source')
expect(workflow).toContain('export COMPOSE_FILE="$REPO_DIR/docker-compose.yml"')
expect(workflow).toContain('docker compose down --remove-orphans')
expect(workflow).toContain('docker compose up -d --remove-orphans')
expect(workflow).not.toContain('docker compose exec -T worldweave')
expect(workflow).not.toContain('worldweave-refresh logs')
expect(workflow).not.toContain('set_submodule_url worldweave')
Expand Down
Loading