fix(ci): combined docker + python CI

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.45.0 to 2.0.1.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/1.45.0...2.0.1)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -11,14 +11,8 @@ on:
       - ".github/dependabot.yml"
 
 jobs:
-  pythonci:
-    uses: luketainton/gha-workflows/.github/workflows/ci-python.yml@main
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-  
-  dockerci:
-    uses: luketainton/gha-workflows/.github/workflows/ci-docker.yml@main
+  ci:
+    uses: luketainton/gha-workflows/.github/workflows/ci-python-with-docker.yml@main
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/release.yml

@@ -23,6 +23,7 @@ jobs:
           tag: ${{ steps.tag_version.outputs.new_tag }}
           name: ${{ steps.tag_version.outputs.new_tag }}
           body: ${{ steps.tag_version.outputs.changelog }}
+          generateReleaseNotes: true
 
   publish:
     name: GitHub Container Registry
@@ -33,7 +34,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."""

requirements.txt

@@ -13,7 +13,7 @@ distlib==0.3.8
 filelock==3.13.4
 future==1.0.0
 humanfriendly==10.0
-identify==2.5.35
+identify==2.5.36
 idna==3.7
 iniconfig==2.0.0
 lazy-object-proxy==1.10.0
@@ -22,8 +22,8 @@ mypy-extensions==1.0.0
 nodeenv==1.8.0
 packaging==24.0
 pathspec==0.12.1
-platformdirs==4.2.0
-pluggy==1.4.0
+platformdirs==4.2.1
+pluggy==1.5.0
 py==1.11.0
 pycodestyle==2.11.1
 PyJWT==2.8.0
@@ -33,15 +33,15 @@ python-dotenv==1.0.1
 PyYAML==6.0.1
 requests==2.31.0
 requests-toolbelt==1.0.0
-sentry-sdk==1.45.0
+sentry-sdk==2.0.1
 six==1.16.0
 toml==0.10.2
 tomli==2.0.1
 tomlkit==0.12.4
 urllib3==2.2.1
-virtualenv==20.25.3
-webex-bot==0.4.1
+virtualenv==20.26.0
+webex-bot==0.5.1
 webexteamssdk==1.6.1
-websockets==10.2
+websockets==11.0.3
 wrapt==1.16.0
 xmltodict==0.13.0

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",