added version information to sentry and the about page

This commit is contained in:
Jenny Danzmayr 2023-12-11 18:31:11 +01:00
parent 97c9c7ecb7
commit 4fb1230163
7 changed files with 42 additions and 2 deletions

View file

@ -71,6 +71,7 @@ RUN --mount=type=cache,target=/pip-cache \
pip install --cache-dir /pip-cache uwsgi
FROM base as final
ARG COMMIT
RUN groupadd -r -g 500 c3nav && useradd -r -u 500 -g 500 -G www-data c3nav
RUN mkdir /data /etc/c3nav && chown -R c3nav:c3nav /data /etc/c3nav
VOLUME /data
@ -83,6 +84,7 @@ ENV C3NAV_DEBUG="" \
C3NAV_LOGLEVEL="INFO" \
C3NAV_DATA_DIR="/data" \
C3NAV_AUTOMIGRATE="yes" \
C3NAV_VERSION="${COMMIT}" \
MPLBACKEND="agg" \
UWSGI_WORKERS="4" \
PATH="/app/env/bin/:$PATH"

View file

@ -14,24 +14,26 @@ fi
docker buildx build -f docker/Dockerfile \
--platform linux/arm64,linux/amd64 \
--build-arg "COMMIT=${COMMIT}" \
--label "org.opencontainers.image.version=${COMMIT}" \
-t "ghcr.io/c3nav/c3nav:${COMMIT}" \
--annotation org.opencontainers.image.source="https://github.com/c3nav/c3nav" \
--annotation org.opencontainers.image.url="https://c3nav.de" \
--annotation org.opencontainers.image.authors="c3nav team" \
--annotation org.opencontainers.image.description="Indoor navigation for the Chaos Communication Congress and other events. - Core" \
--tag "ghcr.io/c3nav/c3nav:${COMMIT}" \
--cache-from "type=registry,ref=ghcr.io/c3nav/c3nav_cache:main" \
--cache-to "type=registry,ref=ghcr.io/c3nav/c3nav_cache:main,mode=max" \
--push "${CONTEXT}"
docker buildx build -f docker/tileserver.dockerfile \
--platform linux/arm64,linux/amd64 \
--build-arg "COMMIT=${COMMIT}" \
--label "org.opencontainers.image.version=${COMMIT}" \
-t "ghcr.io/c3nav/c3nav-tileserver:${COMMIT}" \
--annotation org.opencontainers.image.source="https://github.com/c3nav/c3nav" \
--annotation org.opencontainers.image.url="https://c3nav.de" \
--annotation org.opencontainers.image.authors="c3nav team" \
--annotation org.opencontainers.image.description="Indoor navigation for the Chaos Communication Congress and other events. - Tileserver" \
--tag "ghcr.io/c3nav/c3nav-tileserver:${COMMIT}" \
--cache-from "type=registry,ref=ghcr.io/c3nav/c3nav_cache:tileserver_main" \
--cache-to "type=registry,ref=ghcr.io/c3nav/c3nav_cache:tileserver_main,mode=max" \
--push "${CONTEXT}"

View file

@ -50,6 +50,7 @@ RUN --mount=type=cache,target=/pip-cache \
pip install --cache-dir /pip-cache uwsgi
FROM base as final
ARG COMMIT
RUN groupadd -r -g 500 c3nav && useradd -r -u 500 -g 500 -G www-data c3nav
RUN mkdir /data && chown -R c3nav:c3nav /data
VOLUME /data
@ -61,6 +62,7 @@ ENV C3NAV_DEBUG="" \
C3NAV_LOGLEVEL="INFO" \
C3NAV_DATA_DIR="/data" \
C3NAV_RELOAD_INTERVAL="60" \
C3NAV_VERSION="${COMMIT}"
UWSGI_WORKERS="4"
# The following environment variables need to be set to start the tileserver