Skip to content

Commit f08c19b

Browse files
committed
more logging changes
1 parent 3969b90 commit f08c19b

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ FROM python:3.13-slim
22

33
WORKDIR /app
44

5-
# Capture git information during build (before copying source)
5+
# Capture build information during build
66
ARG GIT_COMMIT_HASH
77
ARG GIT_COMMIT_MESSAGE
88
ARG GIT_COMMIT_DATE
99
ARG GIT_BRANCH
1010

11-
# Set git info as environment variables with APP_ prefix to avoid conflicts
12-
ENV APP_GIT_COMMIT_HASH=${GIT_COMMIT_HASH:-unknown}
13-
ENV APP_GIT_COMMIT_MESSAGE=${GIT_COMMIT_MESSAGE:-unknown}
14-
ENV APP_GIT_COMMIT_DATE=${GIT_COMMIT_DATE:-unknown}
15-
ENV APP_GIT_BRANCH=${GIT_BRANCH:-unknown}
11+
# Set build info as environment variables with BUILD_ prefix to avoid Portainer conflicts
12+
ENV BUILD_COMMIT_HASH=${GIT_COMMIT_HASH:-unknown}
13+
ENV BUILD_COMMIT_MESSAGE=${GIT_COMMIT_MESSAGE:-unknown}
14+
ENV BUILD_COMMIT_DATE=${GIT_COMMIT_DATE:-unknown}
15+
ENV BUILD_BRANCH=${GIT_BRANCH:-unknown}
1616

1717
# Install system dependencies (removed git as we don't need it in container)
1818
RUN apt-get update && apt-get install -y --no-install-recommends \

app.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ def format(self, record):
7070
logger.info(f" ├─ Feature webhook: {'✓ Configured' if DISCORD_WEBHOOK_FEATURE else '✗ Not configured'}")
7171
logger.info(f" └─ Default webhook: {'✓ Configured' if DISCORD_WEBHOOK_DEFAULT else '✗ Not configured'}")
7272

73-
# Display git information
74-
git_commit = os.getenv('APP_GIT_COMMIT_HASH', 'unknown')
75-
git_message = os.getenv('APP_GIT_COMMIT_MESSAGE', 'unknown')
76-
git_date = os.getenv('APP_GIT_COMMIT_DATE', 'unknown')
77-
git_branch = os.getenv('APP_GIT_BRANCH', 'unknown')
73+
# Display build information
74+
build_commit = os.getenv('BUILD_COMMIT_HASH', 'unknown')
75+
build_message = os.getenv('BUILD_COMMIT_MESSAGE', 'unknown')
76+
build_date = os.getenv('BUILD_COMMIT_DATE', 'unknown')
77+
build_branch = os.getenv('BUILD_BRANCH', 'unknown')
7878

79-
if git_commit != 'unknown':
79+
if build_commit != 'unknown':
8080
logger.info("📋 Build Information:")
81-
logger.info(f" ├─ Branch: {git_branch}")
82-
logger.info(f" ├─ Commit: {git_commit[:8]}...")
83-
logger.info(f" ├─ Message: {git_message}")
84-
logger.info(f" └─ Date: {git_date}")
81+
logger.info(f" ├─ Branch: {build_branch}")
82+
logger.info(f" ├─ Commit: {build_commit[:8]}...")
83+
logger.info(f" ├─ Message: {build_message}")
84+
logger.info(f" └─ Date: {build_date}")
8585
else:
8686
logger.info("📋 Build Information: Development build (git info not available)")
8787

0 commit comments

Comments
 (0)