Skip to content

fix(deploy): populate build provenance on dev (#958) #968

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
vybe merged 1 commit into from
May 28, 2026
Merged

fix(deploy): populate build provenance on dev (#958) #968

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
20 changes: 19 additions & 1 deletion .github/workflows/deploy-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,25 @@ jobs:
COMPOSE_FILES="-f docker-compose.prod.yml -f docker-compose.prod.enterprise.yml"

echo "=== Build ==="
sudo docker compose ${COMPOSE_FILES} build --no-cache backend frontend mcp-server scheduler
# Build-time provenance (#926 / #958). docker-compose.prod.yml
# backend.build.args reads these env vars; absent them, the
# Dockerfile defaults to "unknown" and Build Info in the UI
# shows a wall of unknown values. Mirrors scripts/deploy/start.sh.
# Inline VAR=val form bypasses sudo's default env_reset — `sudo -E`
# would depend on env_keep being permissive in sudoers, which it
# is not by default on Ubuntu.
GIT_COMMIT=$(git rev-parse HEAD)
GIT_COMMIT_SUBJECT=$(git log -1 --pretty=%s)
GIT_COMMIT_TIMESTAMP=$(git log -1 --pretty=%cI)
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
sudo \
GIT_COMMIT="${GIT_COMMIT}" \
GIT_COMMIT_SUBJECT="${GIT_COMMIT_SUBJECT}" \
GIT_COMMIT_TIMESTAMP="${GIT_COMMIT_TIMESTAMP}" \
GIT_BRANCH="${GIT_BRANCH}" \
BUILD_DATE="${BUILD_DATE}" \
docker compose ${COMPOSE_FILES} build --no-cache backend frontend mcp-server scheduler

echo "=== Restart ==="
sudo docker compose ${COMPOSE_FILES} up -d backend frontend mcp-server scheduler
Expand Down
10 changes: 10 additions & 0 deletions docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ services:
build:
context: .
dockerfile: docker/backend/Dockerfile
# Build-time provenance (#926 / #958). Forwarded to Dockerfile ARGs
# → ENV vars → `GET /api/version` payload. The deploy-dev workflow
# exports these from the checked-out repo before `docker compose
# build`; absent that, the Dockerfile defaults to "unknown".
args:
GIT_COMMIT: ${GIT_COMMIT:-unknown}
GIT_COMMIT_SUBJECT: ${GIT_COMMIT_SUBJECT:-unknown}
GIT_COMMIT_TIMESTAMP: ${GIT_COMMIT_TIMESTAMP:-unknown}
GIT_BRANCH: ${GIT_BRANCH:-unknown}
BUILD_DATE: ${BUILD_DATE:-unknown}
container_name: trinity-backend
restart: unless-stopped
ports:
Expand Down
Loading