Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
9830c5cc3a |
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@ -11,8 +11,14 @@ on:
|
|||||||
- ".github/dependabot.yml"
|
- ".github/dependabot.yml"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ci:
|
pythonci:
|
||||||
uses: luketainton/gha-workflows/.github/workflows/ci-python-with-docker.yml@main
|
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
|
||||||
secrets:
|
secrets:
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
||||||
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
|
||||||
|
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@ -23,7 +23,6 @@ jobs:
|
|||||||
tag: ${{ steps.tag_version.outputs.new_tag }}
|
tag: ${{ steps.tag_version.outputs.new_tag }}
|
||||||
name: ${{ steps.tag_version.outputs.new_tag }}
|
name: ${{ steps.tag_version.outputs.new_tag }}
|
||||||
body: ${{ steps.tag_version.outputs.changelog }}
|
body: ${{ steps.tag_version.outputs.changelog }}
|
||||||
generateReleaseNotes: true
|
|
||||||
|
|
||||||
publish:
|
publish:
|
||||||
name: GitHub Container Registry
|
name: GitHub Container Registry
|
||||||
@ -34,11 +33,7 @@ jobs:
|
|||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
run: echo ${{ secrets.GHCR_ACCESS_TOKEN }} | docker login ghcr.io -u luketainton --password-stdin
|
run: echo ${{ secrets.GHCR_ACCESS_TOKEN }} | docker login ghcr.io -u luketainton --password-stdin
|
||||||
- name: Build image for GitHub Package Registry
|
- name: Build image for GitHub Package Registry
|
||||||
run: |
|
run: docker build . --file Dockerfile --tag ghcr.io/luketainton/roboluke-tasks:${{ needs.release.outputs.new_tag }} --tag ghcr.io/luketainton/roboluke-tasks:latest
|
||||||
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
|
- name: Push image to GitHub Package Registry
|
||||||
run: |
|
run: |
|
||||||
docker push ghcr.io/luketainton/roboluke-tasks:latest
|
docker push ghcr.io/luketainton/roboluke-tasks:latest
|
||||||
|
@ -15,7 +15,4 @@ RUN pip install --no-cache-dir -r requirements.txt
|
|||||||
|
|
||||||
ENTRYPOINT ["python3", "-B", "-m", "app.main"]
|
ENTRYPOINT ["python3", "-B", "-m", "app.main"]
|
||||||
|
|
||||||
ARG version="dev"
|
|
||||||
ENV APP_VERSION=$version
|
|
||||||
|
|
||||||
COPY app /run/app
|
COPY app /run/app
|
||||||
|
@ -15,7 +15,6 @@ if config.sentry_enabled:
|
|||||||
dsn=config.sentry_dsn,
|
dsn=config.sentry_dsn,
|
||||||
enable_tracing=True,
|
enable_tracing=True,
|
||||||
environment=config.environment,
|
environment=config.environment,
|
||||||
release=config.version,
|
|
||||||
integrations=[StdlibIntegration()],
|
integrations=[StdlibIntegration()],
|
||||||
spotlight=True
|
spotlight=True
|
||||||
)
|
)
|
||||||
|
@ -8,7 +8,6 @@ class Config:
|
|||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
"""Configuration module."""
|
"""Configuration module."""
|
||||||
self.__environment: str = os.environ.get("APP_LIFECYCLE", "DEV").upper()
|
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.__bot_name: str = os.environ["BOT_NAME"]
|
||||||
self.__webex_token: str = os.environ["WEBEX_API_KEY"]
|
self.__webex_token: str = os.environ["WEBEX_API_KEY"]
|
||||||
self.__admin_first_name: str = os.environ["ADMIN_FIRST_NAME"]
|
self.__admin_first_name: str = os.environ["ADMIN_FIRST_NAME"]
|
||||||
@ -25,11 +24,6 @@ class Config:
|
|||||||
"""Returns the current app lifecycle."""
|
"""Returns the current app lifecycle."""
|
||||||
return self.__environment
|
return self.__environment
|
||||||
|
|
||||||
@property
|
|
||||||
def version(self) -> str:
|
|
||||||
"""Returns the current app version."""
|
|
||||||
return self.__version
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def sentry_enabled(self) -> bool:
|
def sentry_enabled(self) -> bool:
|
||||||
"""Returns True if Sentry SDK is enabled, else False."""
|
"""Returns True if Sentry SDK is enabled, else False."""
|
||||||
|
@ -13,7 +13,7 @@ distlib==0.3.8
|
|||||||
filelock==3.13.4
|
filelock==3.13.4
|
||||||
future==1.0.0
|
future==1.0.0
|
||||||
humanfriendly==10.0
|
humanfriendly==10.0
|
||||||
identify==2.5.36
|
identify==2.5.35
|
||||||
idna==3.7
|
idna==3.7
|
||||||
iniconfig==2.0.0
|
iniconfig==2.0.0
|
||||||
lazy-object-proxy==1.10.0
|
lazy-object-proxy==1.10.0
|
||||||
@ -22,8 +22,8 @@ mypy-extensions==1.0.0
|
|||||||
nodeenv==1.8.0
|
nodeenv==1.8.0
|
||||||
packaging==24.0
|
packaging==24.0
|
||||||
pathspec==0.12.1
|
pathspec==0.12.1
|
||||||
platformdirs==4.2.1
|
platformdirs==4.2.0
|
||||||
pluggy==1.5.0
|
pluggy==1.4.0
|
||||||
py==1.11.0
|
py==1.11.0
|
||||||
pycodestyle==2.11.1
|
pycodestyle==2.11.1
|
||||||
PyJWT==2.8.0
|
PyJWT==2.8.0
|
||||||
@ -33,15 +33,15 @@ python-dotenv==1.0.1
|
|||||||
PyYAML==6.0.1
|
PyYAML==6.0.1
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
requests-toolbelt==1.0.0
|
requests-toolbelt==1.0.0
|
||||||
sentry-sdk==2.0.1
|
sentry-sdk==1.45.0
|
||||||
six==1.16.0
|
six==1.16.0
|
||||||
toml==0.10.2
|
toml==0.10.2
|
||||||
tomli==2.0.1
|
tomli==2.0.1
|
||||||
tomlkit==0.12.4
|
tomlkit==0.12.4
|
||||||
urllib3==2.2.1
|
urllib3==2.2.1
|
||||||
virtualenv==20.26.0
|
virtualenv==20.25.3
|
||||||
webex-bot==0.5.1
|
webex-bot==0.4.1
|
||||||
webexteamssdk==1.6.1
|
webexteamssdk==1.6.1
|
||||||
websockets==11.0.3
|
websockets==10.2
|
||||||
wrapt==1.16.0
|
wrapt==1.16.0
|
||||||
xmltodict==0.13.0
|
xmltodict==0.13.0
|
||||||
|
@ -6,7 +6,6 @@ import os
|
|||||||
|
|
||||||
|
|
||||||
vars: dict = {
|
vars: dict = {
|
||||||
"APP_VERSION": "dev",
|
|
||||||
"BOT_NAME": "TestBot",
|
"BOT_NAME": "TestBot",
|
||||||
"WEBEX_API_KEY": "testing",
|
"WEBEX_API_KEY": "testing",
|
||||||
"ADMIN_FIRST_NAME": "Test",
|
"ADMIN_FIRST_NAME": "Test",
|
||||||
|
Reference in New Issue
Block a user