mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-08-11 00:30:12 -04:00
2722ed1538
The SpoolBuddy remote-update flow always pulled `main` on the remote device when Bambuddy ran under Docker, regardless of which branch the image was built from. Root cause: the Dockerfile COPYs only backend/ and static/, and .dockerignore excluded .git entirely, so the container had no git metadata anywhere. detect_current_branch() silently fell through its file-read path and returned the GIT_BRANCH env-var default of "main". The old subprocess-based implementation had the same bug but it was masked twice: no .git in the image AND no `git` binary in the image, so git rev-parse raised FileNotFoundError, the bare except swallowed it, and the fallback kicked in. Let the one file we actually need (.git/HEAD — ~20 bytes containing `ref: refs/heads/<branch>`) through the .dockerignore filter and COPY it into the image at /app/.git/HEAD. detect_current_branch() already reads exactly that path, so no Python code changes are needed. Bind- mount development setups are unaffected — the bind mount overlays the baked-in file with the live repo's .git/HEAD. Verified with a throwaway alpine build using the same .dockerignore pattern: .git/HEAD passes through, decoy .git/refs and .git/objects entries are excluded, and COPY writes the expected content into the image.
60 lines
904 B
Text
60 lines
904 B
Text
# Git
|
|
# Exclude all .git contents EXCEPT HEAD. HEAD is a tiny text file (under
|
|
# 100 bytes) containing e.g. `ref: refs/heads/dev`, which the Dockerfile
|
|
# copies into the image so detect_current_branch() in spoolbuddy_ssh.py
|
|
# can report the correct branch for SpoolBuddy remote updates. Without
|
|
# this, the production image has no git metadata at all and always falls
|
|
# back to "main" regardless of which branch the operator built from.
|
|
.git/*
|
|
!.git/HEAD
|
|
.gitignore
|
|
|
|
# Python
|
|
__pycache__
|
|
*.py[cod]
|
|
*$py.class
|
|
*.so
|
|
.Python
|
|
venv/
|
|
.venv/
|
|
ENV/
|
|
env/
|
|
.env
|
|
*.egg-info/
|
|
.eggs/
|
|
dist/
|
|
build/
|
|
|
|
# Node
|
|
frontend/node_modules/
|
|
frontend/.npm
|
|
|
|
# IDE
|
|
.idea/
|
|
.vscode/
|
|
*.swp
|
|
*.swo
|
|
|
|
# Testing
|
|
.pytest_cache/
|
|
.coverage
|
|
htmlcov/
|
|
|
|
# Logs and data (will be mounted as volumes)
|
|
logs/
|
|
data/
|
|
*.log
|
|
*.db
|
|
|
|
# Build artifacts
|
|
static/
|
|
|
|
# Documentation
|
|
docs/
|
|
*.md
|
|
!requirements.txt
|
|
|
|
# Docker
|
|
Dockerfile
|
|
docker-compose*.yml
|
|
.dockerignore
|