Save the git commit and build date of the docker images

Author: rolandgeider

.github/workflows/docker.yml

@@ -71,6 +71,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set build date
+        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%d')" >> $GITHUB_ENV
+
       - name: Build and push by digest
         id: build
         uses: docker/build-push-action@v6
@@ -81,6 +84,9 @@ jobs:
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          build-args: |
+            BUILD_DATE=${{ env.BUILD_DATE }}
+            BUILD_COMMIT=${{ github.sha }}
 
           # https://github.com/moby/buildkit#--export-cache-options
           # https://github.com/docker/buildx#--cache-tonametypetypekeyvalue

extras/docker/production/Dockerfile

@@ -76,7 +76,13 @@ RUN yarn install \
 FROM wger/base:latest AS final
 LABEL org.opencontainers.image.authors="wger team <[email protected]>"
 ARG DOCKER_DIR=./extras/docker/production
+ARG BUILD_COMMIT
+ARG BUILD_DATE
+
 ENV PATH="/home/wger/.local/bin:$PATH"
+ENV APP_BUILD_COMMIT=$BUILD_COMMIT
+ENV APP_BUILD_DATE=$BUILD_DATE
+
 WORKDIR /home/wger/src
 EXPOSE 8000
 

wger/software/templates/about_us.html

@@ -164,7 +164,11 @@ <h4 class="mt-4">{% translate "Thank You!" %}</h4>
     </div>
 
     <div class="alert alert-dark mt-5" role="alert">
-        {% translate "Current version" %} {{ version }}
+        {% translate "Current version" %} <strong>{{ version }}</strong>
+        {% if date %}
+            <br>
+            {% translate 'Date' %} <strong>{{ date }}</strong>
+        {% endif %}
     </div>
 {% endblock %}
 

wger/software/urls.py

@@ -23,7 +23,10 @@
 
 # wger
 from wger.software import views
-from wger.version import get_version
+from wger.version import (
+    get_version_date,
+    get_version_with_git,
+)
 
 
 urlpatterns = [
@@ -45,7 +48,8 @@
     path(
         'about-us',
         TemplateView.as_view(
-            template_name='about_us.html', extra_context={'version': get_version()}
+            template_name='about_us.html',
+            extra_context={'version': get_version_with_git(), 'date': get_version_date()},
         ),
         name='about-us',
     ),

wger/version.py

@@ -14,6 +14,7 @@
 
 # Standard Library
 import logging
+import os
 
 # Third Party
 from packaging.version import Version
@@ -43,3 +44,16 @@ def get_version(version: Version = None) -> str:
         version = VERSION
 
     return str(version)
+
+
+def get_version_with_git(version: Version = None) -> str:
+    version = get_version(version)
+    git_sha1 = os.environ.get('APP_BUILD_COMMIT', '')[:7]
+    if git_sha1:
+        version += f'+git{git_sha1}'
+
+    return version
+
+
+def get_version_date() -> str | None:
+    return os.environ.get('APP_BUILD_DATE')