git sha

forza-mor-rotterdam · Jan 31, 2024 · 5709f8b · 5709f8b
1 parent 30b50d4
commit 5709f8b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
@@ -67,7 +67,7 @@ jobs:
         id: meta_app
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app-develop
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app
 
       - name: Build and push app Docker image
         uses: docker/build-push-action@v3
@@ -76,6 +76,8 @@ jobs:
           push: true
           tags: ${{ steps.meta_app.outputs.tags }}
           labels: ${{ steps.meta_app.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
 
       - name: Start rollout on k8s platform
         uses: actions-hub/kubectl@master

diff --git a/.github/workflows/deploy-prd.yaml b/.github/workflows/deploy-prd.yaml
@@ -33,7 +33,7 @@ jobs:
         id: meta_app
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app-production
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app
 
       - name: Build and push app Docker image
         uses: docker/build-push-action@v3
@@ -42,6 +42,8 @@ jobs:
           push: true
           tags: ${{ steps.meta_app.outputs.tags }}
           labels: ${{ steps.meta_app.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
 
       - name: Start rollout on k8s platform
         uses: actions-hub/kubectl@master

diff --git a/.github/workflows/deploy-test.yaml b/.github/workflows/deploy-test.yaml
@@ -33,7 +33,7 @@ jobs:
         id: meta_app
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app-test
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app
 
       - name: Build and push app Docker image
         uses: docker/build-push-action@v3
@@ -42,6 +42,8 @@ jobs:
           push: true
           tags: ${{ steps.meta_app.outputs.tags }}
           labels: ${{ steps.meta_app.outputs.labels }}
+          build-args: |
+            GIT_SHA=${{ github.sha }}
 
       - name: Start rollout on k8s platform
         uses: actions-hub/kubectl@master

diff --git a/app/Dockerfile b/app/Dockerfile
@@ -63,4 +63,7 @@ RUN mkdir -p /media \
 
 USER $APP_USER
 
+ARG GIT_SHA
+ENV GIT_SHA=$GIT_SHA
+
 CMD ["bash", "/app/deploy/docker-entrypoint.sh"]
diff --git a/app/apps/main/templates/base.html b/app/apps/main/templates/base.html
@@ -5,6 +5,7 @@
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="git_sha" value="{{ GIT_SHA }}">
         <title>{% block title %}Begraven en Cremeren{% endblock %}</title>
         <link rel="apple-touch-icon" sizes="180x180" href="{{base_url}}{%webpack_static 'images/apple-touch-icon.png' %}"/>
         <link rel="icon" type="image/png" sizes="32x32" href="{{base_url}}{%webpack_static 'images/favicon-32x32.png' %}"/>

diff --git a/app/config/context_processors.py b/app/config/context_processors.py
@@ -26,4 +26,5 @@ def general_settings(context):
         "SESSION_STATE": token_decoded.get("session_state"),
         "LOGOUT_URL": reverse("oidc_logout"),
         "LOGIN_URL": f"{reverse('oidc_authentication_init')}?next={absolute(context).get('FULL_URL')}",
+        "GIT_SHA": settings.GIT_SHA,
     }
diff --git a/app/config/settings.py b/app/config/settings.py
@@ -16,6 +16,7 @@
     "DJANGO_SECRET_KEY", os.environ.get("SECRET_KEY", os.environ.get("APP_SECRET"))
 )
 
+GIT_SHA = os.getenv("GIT_SHA")
 ENVIRONMENT = os.getenv("ENVIRONMENT")
 DEBUG = ENVIRONMENT == "development"
 

diff --git a/app/requirements.txt b/app/requirements.txt
@@ -7,7 +7,7 @@ psycopg2-binary==2.9.5
 django-webpack-loader==1.7.0
 requests
 debugpy
-django-health-check
+django-health-check==3.17.0
 django_redis
 django-permissions-policy==4.14.0
 django-cors-headers==3.13.0