Merge pull request #186 from luketainton/next

Release 2024-04-21.2

.github/workflows/release.yml

@@ -33,7 +33,11 @@ jobs:
       - name: Login to GitHub Container Registry
         run: echo ${{ secrets.GHCR_ACCESS_TOKEN }} | docker login ghcr.io -u luketainton --password-stdin
       - name: Build image for GitHub Package Registry
-        run: docker build . --file Dockerfile --tag ghcr.io/luketainton/roboluke-tasks:${{ needs.release.outputs.new_tag }} --tag ghcr.io/luketainton/roboluke-tasks:latest
+        run: |
+          docker build . --file Dockerfile \
+          --build-arg "version=${{ needs.release.outputs.new_tag }}" \
+          --tag ghcr.io/luketainton/roboluke-tasks:${{ needs.release.outputs.new_tag }} \
+          --tag ghcr.io/luketainton/roboluke-tasks:latest
       - name: Push image to GitHub Package Registry
         run: |
           docker push ghcr.io/luketainton/roboluke-tasks:latest

Dockerfile

@@ -15,4 +15,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 ENTRYPOINT ["python3", "-B", "-m", "app.main"]
 
+ARG version="dev"
+ENV APP_VERSION=$version
+
 COPY app /run/app

app/main.py

@@ -15,6 +15,7 @@ if config.sentry_enabled:
         dsn=config.sentry_dsn,
         enable_tracing=True,
         environment=config.environment,
+        release=config.version,
         integrations=[StdlibIntegration()],
         spotlight=True
     )

app/utils/config.py

@@ -8,6 +8,7 @@ class Config:
     def __init__(self) -> None:
         """Configuration module."""
         self.__environment: str = os.environ.get("APP_LIFECYCLE", "DEV").upper()
+        self.__version: str = os.environ["APP_VERSION"]
         self.__bot_name: str = os.environ["BOT_NAME"]
         self.__webex_token: str = os.environ["WEBEX_API_KEY"]
         self.__admin_first_name: str = os.environ["ADMIN_FIRST_NAME"]
@@ -24,6 +25,11 @@ class Config:
         """Returns the current app lifecycle."""
         return self.__environment
 
+    @property
+    def version(self) -> str:
+        """Returns the current app version."""
+        return self.__version
+
     @property
     def sentry_enabled(self) -> bool:
         """Returns True if Sentry SDK is enabled, else False."""

tests/test_config.py

@@ -6,6 +6,7 @@ import os
 
 
 vars: dict = {
+    "APP_VERSION": "dev",
     "BOT_NAME": "TestBot",
     "WEBEX_API_KEY": "testing",
     "ADMIN_FIRST_NAME": "Test",