chore: don't use git to determine the commit hash

Get the commit hash from the openshift's environment.

Author: charn

Dockerfile

@@ -22,9 +22,6 @@ RUN yum update -y && yum install -y \
     && uwsgi --build-plugin https://github.com/City-of-Helsinki/uwsgi-sentry \
     && yum clean all
 
-# fatal: detected dubious ownership in repository at '/app'
-RUN git config --system --add safe.directory /app
-
 COPY --chown=root:root --chmod=755 docker-entrypoint.sh /entrypoint/docker-entrypoint.sh
 ENTRYPOINT ["/entrypoint/docker-entrypoint.sh"]
 
@@ -46,4 +43,4 @@ FROM appbase AS production
 RUN SECRET_KEY="only-used-for-collectstatic" python manage.py collectstatic
 
 USER default
-EXPOSE 8000/tcp
+EXPOSE 8000/tcp

common/utils.py

@@ -86,7 +86,7 @@ def update_object_with_translations(model, model_data):
 
 
 def get_api_version():
-    return " | ".join((__version__, settings.COMMIT_HASH.decode("utf-8")))
+    return " | ".join((__version__, settings.COMMIT_HASH))
 
 
 def get_node_id_from_global_id(global_id, node_name):

palvelutarjotin/settings.py

@@ -10,6 +10,7 @@
 from django.utils.translation import gettext_lazy as _
 from sentry_sdk.integrations.django import DjangoIntegration
 
+from palvelutarjotin import __version__
 from palvelutarjotin.consts import CSP
 
 checkout_dir = environ.Path(__file__) - 2
@@ -94,6 +95,7 @@
     SOCIAL_AUTH_TUNNISTAMO_SECRET=(str, ""),  # empty to ignore it's being unset.
     LOGIN_REDIRECT_URL=(str, "/admin/"),
     LOGOUT_REDIRECT_URL=(str, "/admin/"),
+    OPENSHIFT_BUILD_COMMIT=(str, ""),
 )
 
 if os.path.exists(env_file):
@@ -163,9 +165,11 @@
 except Exception:
     COMMIT_HASH = b"n/a"
 
+COMMIT_HASH = env("OPENSHIFT_BUILD_COMMIT")
+VERSION = __version__
 sentry_sdk.init(
     dsn=env.str("SENTRY_DSN"),
-    release=COMMIT_HASH,
+    release=env("OPENSHIFT_BUILD_COMMIT", VERSION),
     environment=env("SENTRY_ENVIRONMENT"),
     integrations=[DjangoIntegration()],
 )

palvelutarjotin/urls.py

@@ -64,7 +64,7 @@ def readiness(*args, **kwargs):
         "status": "ok",
         "release": settings.APP_RELEASE,
         "packageVersion": __version__,
-        "commitHash": settings.COMMIT_HASH.decode("utf-8"),
+        "commitHash": settings.COMMIT_HASH,
         "buildTime": settings.APP_BUILD_TIME.strftime("%Y-%m-%dT%H:%M:%S.000Z"),
     }
     return JsonResponse(response_json, status=200)