From f37fc3ec1a5cca62440ada2e4b0866ffc55545e1 Mon Sep 17 00:00:00 2001 From: Henning Merklinger Date: Thu, 4 Jan 2024 20:09:04 +0100 Subject: [PATCH] updated docker release --- .github/workflows/release.yml | 14 +++++++++++++- docker/DOCKER_README.md | 4 ++-- docker/entrypoint.sh | 3 +-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 692ec952..0b8ba165 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: branches: - main tags: - - v* + - ^v[0-9]+.[0-9]+.[0-9]+$ pull_request: env: @@ -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: diff --git a/docker/DOCKER_README.md b/docker/DOCKER_README.md index 3f3059e5..069fce9d 100644 --- a/docker/DOCKER_README.md +++ b/docker/DOCKER_README.md @@ -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) # Quick Start diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 69897429..d4c2fe02 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -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 -- "$@"