fix: version Docker — générer VERSION file depuis .git/HEAD au build
CI / lint (push) Failing after 9s
CI / test (push) Has been skipped
CI / build (push) Has been skipped
CI / e2e (push) Has been skipped
CI / security (push) Successful in 17s
Desktop Build / build-windows (push) Has been cancelled
Desktop Build / build-linux (push) Has been cancelled
CI / lint (push) Failing after 9s
CI / test (push) Has been skipped
CI / build (push) Has been skipped
CI / e2e (push) Has been skipped
CI / security (push) Successful in 17s
Desktop Build / build-windows (push) Has been cancelled
Desktop Build / build-linux (push) Has been cancelled
- Dockerfile: COPY .git/HEAD + .git/refs/ → génère backend/VERSION avec hash - version.py: fallback lit backend/VERSION (à côté du module, pas racine repo) - Format: 1.8.0-0-g<8-char-hash> ou 1.8.0-dev si indisponible
This commit is contained in:
+16
@@ -31,6 +31,22 @@ RUN apt-get update \
|
|||||||
COPY backend/ ./backend/
|
COPY backend/ ./backend/
|
||||||
COPY frontend/ ./frontend/
|
COPY frontend/ ./frontend/
|
||||||
|
|
||||||
|
# Generate VERSION file from git (fallback for version.py when .git is not available)
|
||||||
|
COPY .git/HEAD .git/refs/ /tmp/git-refs/
|
||||||
|
RUN cd /tmp/git-refs && \
|
||||||
|
if [ -f HEAD ]; then \
|
||||||
|
REF=$(cat HEAD | awk '{print $2}'); \
|
||||||
|
if [ -f "$REF" ]; then \
|
||||||
|
HASH=$(cat "$REF" | head -c 8); \
|
||||||
|
echo "1.8.0-0-g${HASH}" > /app/backend/VERSION; \
|
||||||
|
else \
|
||||||
|
echo "1.8.0-dev" > /app/backend/VERSION; \
|
||||||
|
fi; \
|
||||||
|
else \
|
||||||
|
echo "1.8.0-dev" > /app/backend/VERSION; \
|
||||||
|
fi && \
|
||||||
|
rm -rf /tmp/git-refs
|
||||||
|
|
||||||
# Create non-root user for security + data directory for auth persistence
|
# Create non-root user for security + data directory for auth persistence
|
||||||
# Using explicit UID/GID 1000 to match common host user and docker-compose settings
|
# Using explicit UID/GID 1000 to match common host user and docker-compose settings
|
||||||
RUN groupadd -g 1000 obsigate && useradd -u 1000 -g obsigate -d /app -s /sbin/nologin obsigate \
|
RUN groupadd -g 1000 obsigate && useradd -u 1000 -g obsigate -d /app -s /sbin/nologin obsigate \
|
||||||
|
|||||||
+2
-2
@@ -37,8 +37,8 @@ def get_version() -> str:
|
|||||||
except (FileNotFoundError, subprocess.TimeoutExpired, OSError):
|
except (FileNotFoundError, subprocess.TimeoutExpired, OSError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Fallback: try reading from a VERSION file
|
# Fallback: try reading from a VERSION file next to this module
|
||||||
version_file = _ROOT / "VERSION"
|
version_file = Path(__file__).parent / "VERSION"
|
||||||
if version_file.exists():
|
if version_file.exists():
|
||||||
return version_file.read_text().strip()
|
return version_file.read_text().strip()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user