Skip to content

Commit

Permalink
Merge pull request #436 from Der-Henning/dev
Browse files Browse the repository at this point in the history
Fix: New magic bag price API
  • Loading branch information
Der-Henning authored Jan 6, 2024
2 parents e2e3611 + fd03a24 commit 50fdcbf
Show file tree
Hide file tree
Showing 13 changed files with 167 additions and 118 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
tags:
- v*
- ^v[0-9]+.[0-9]+.[0-9]+$
pull_request:

env:
Expand Down Expand Up @@ -59,6 +59,18 @@ jobs:
push: ${{ github.event_name == 'push' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- uses: iamazeem/substitute-action@v1
env:
VERSION: ${{ steps.meta.outputs.version }}
MAJOR: ${{ steps.meta.outputs.major }}
MINIOR: ${{ steps.meta.outputs.minor }}
with:
variables: |
VERSION
MAJOR
MINOR
input-files: |
./docker/DOCKER_README.md
- uses: peter-evans/dockerhub-description@v3
if: github.event_name == 'push'
with:
Expand Down
4 changes: 2 additions & 2 deletions docker/DOCKER_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Readme, source, and documentation on [https://github.com/Der-Henning/tgtg](https

- [`edge`](https://github.com/Der-Henning/tgtg/blob/main/docker/Dockerfile)
- [`edge-alpine`](https://github.com/Der-Henning/tgtg/blob/main/docker/Dockerfile.alpine)
- [`v1`, `v1.18`, `v1.18.0`, `latest`](https://github.com/Der-Henning/tgtg/blob/v1.18.0/docker/Dockerfile)
- [`v1-alpine`, `v1.18-alpine`, `v1.18.0-alpine`, `latest-alpine`](https://github.com/Der-Henning/tgtg/blob/v1.18.0/docker/Dockerfile.alpine)
- [`${MAJOR}`, `${MINIOR}`, `${VERSION}`, `latest`](https://github.com/Der-Henning/tgtg/blob/${VERSION}/docker/Dockerfile)
- [`${MAJOR}-alpine`, `${MINIOR}-alpine`, `${VERSION}-alpine`, `latest-alpine`](https://github.com/Der-Henning/tgtg/blob/${VERSION}/docker/Dockerfile.alpine)

<!-- markdownlint-disable-next-line MD025 -->
# Quick Start
Expand Down
3 changes: 1 addition & 2 deletions docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set -e

echo "Updating UID and GID to ${UID}:${GID}"
usermod -u ${UID} tgtg && groupmod -g ${GID} tgtg
chown -R ${UID}:${GID} /tokens /logs
chown -R ${UID}:${GID} ${TGTG_TOKEN_PATH} ${LOGS_PATH}

echo "Starting tgtg"
exec runuser -u tgtg -- "$@"
61 changes: 33 additions & 28 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name = "tgtg-scanner"
packages = [{include = "tgtg_scanner"}]
readme = "README.md"
repository = "https://github.com/Der-Henning/tgtg"
version = "1.18.0_rc3"
version = "1.18.0"

[tool.poetry.dependencies]
apprise = "^1.4.0"
Expand Down
Loading

0 comments on commit 50fdcbf

Please sign in to comment.