From 0a950cefe2334abd42e4757fb2b11b9d908dfa6a Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:03:27 +0200 Subject: [PATCH 1/8] Workflow update --- .gitea/workflows/docker-build.yaml | 80 +++++++------------ CHANGELOG.md | 23 ++++++ ...ompose.yaml => example.docker-compose.yaml | 0 example.env | 10 +++ 4 files changed, 64 insertions(+), 49 deletions(-) create mode 100644 CHANGELOG.md rename docker-compose.yaml => example.docker-compose.yaml (100%) create mode 100644 example.env diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index 3b2f482..c1e54cb 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -1,64 +1,46 @@ name: Docker Build & Push +run-name: Release ${{ gitea.ref_name }} + on: push: tags: - 'v*' jobs: - build: + build-and-push: runs-on: ubuntu-latest steps: - - name: Code auschecken - uses: actions/checkout@v3 - - - name: Bei Gitea Container Registry anmelden - uses: docker/login-action@v2 - with: - registry: 127.0.0.1:3000 - username: ${{ gitea.actor }} - password: ${{ secrets.token }} - - - name: Docker Image bauen (nur lokal im Runner) - uses: docker/build-push-action@v4 - with: - context: . - push: false - tags: | - 127.0.0.1:3000/rudi/tandur:${{ gitea.ref_name }} - 127.0.0.1:3000/rudi/tandur:latest - - - name: Images zu Gitea pushen - run: | - docker push 127.0.0.1:3000/rudi/tandur:${{ gitea.ref_name }} - docker push 127.0.0.1:3000/rudi/tandur:latest - - release: - if: startsWith(gitea.ref, 'refs/tags/v') - needs: build - runs-on: ubuntu-latest - steps: - - name: Code auschecken - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Gitea Release erstellen + - name: Log in to Gitea Container Registry + uses: docker/login-action@v3 + with: + registry: git.schamagusa.de + username: ${{ gitea.actor }} + password: ${{ secrets.RELEASE_TOKEN }} + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: | + git.schamagusa.de/${{ gitea.repository }}:${{ gitea.ref_name }} + git.schamagusa.de/${{ gitea.repository }}:latest + + - name: Prepare release notes + run: | + sed "s|{{VERSION}}|${{ gitea.ref_name }}|g" CHANGELOG.md > release_notes.md + cat release_notes.md + + - name: Create Release uses: https://gitea.com/actions/gitea-release-action@main with: - api_key: '${{ secrets.TOKEN }}' + body_path: release_notes.md prerelease: ${{ contains(gitea.ref_name, '-rc') || contains(gitea.ref_name, '-beta') || contains(gitea.ref_name, '-alpha') }} - files: |- - docker-compose.yaml - body: | - ## Docker Image: - - ```bash - docker pull git.schamagusa.de/rudi/tandur:latest - ``` - ## Docker Compose - Download the `docker-compose.yaml` - and then - ```bash - docker compose pull - docker compose up -d - ``` + files: | + example.docker-compose.yaml + example.env diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6aa7b73 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,23 @@ +# Release {{VERSION}} + +This version includes a new workflow file, so the Releases come faster and better to you + +## New Features +- Workflow with better description and performance + + +## Bug fixes +- + +--- + +### Installation +> **Note:** This guide assumes that Docker and Docker Compose are already installed. + +Download the `example.env` and the `example.docker-compose.yaml`, edit those and rename to `.env` and `docker-compose.yaml`. + +Then run +```bash +docker compose pull +docker compose up -d +``` diff --git a/docker-compose.yaml b/example.docker-compose.yaml similarity index 100% rename from docker-compose.yaml rename to example.docker-compose.yaml diff --git a/example.env b/example.env new file mode 100644 index 0000000..8286a7b --- /dev/null +++ b/example.env @@ -0,0 +1,10 @@ +# Einvironment Variablen + +API_KEY= + + +TANDOOR_URL = + +SECRET_KEY = +#ALGORITHM = "HS256" +#ACCESS_TOKEN_EXPIRE_MINUTES = 30 From 2db0cc3ecb682fc815fe88512a3aa12d0a1e15dc Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:17:29 +0200 Subject: [PATCH 2/8] fix with uppercase repo name --- .gitea/workflows/docker-build.yaml | 4 ++-- CHANGELOG.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index c1e54cb..07f682c 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -28,8 +28,8 @@ jobs: context: . push: true tags: | - git.schamagusa.de/${{ gitea.repository }}:${{ gitea.ref_name }} - git.schamagusa.de/${{ gitea.repository }}:latest + git.schamagusa.de/${{ toLower(gitea.repository) }}:${{ gitea.ref_name }} + git.schamagusa.de/${{ toLower(gitea.repository) }}:latest - name: Prepare release notes run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aa7b73..51b81c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ This version includes a new workflow file, so the Releases come faster and bette ## Bug fixes -- +- added 'toLower' function to workflow --- From 756799feb648509d28815fcba84406f9d6808962 Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:21:25 +0200 Subject: [PATCH 3/8] fix 'toLower' not implemented --- .gitea/workflows/docker-build.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index 07f682c..90f5dea 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -24,12 +24,14 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v5 + env: + REPO: ${{ gitea.repository }} with: context: . push: true tags: | - git.schamagusa.de/${{ toLower(gitea.repository) }}:${{ gitea.ref_name }} - git.schamagusa.de/${{ toLower(gitea.repository) }}:latest + git.schamagusa.de/${REPO,,}:${{ gitea.ref_name }} + git.schamagusa.de/${REPO,,}:latest - name: Prepare release notes run: | From 26bb103535219acd114a62dbafa3e67e8cdec020 Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:22:18 +0200 Subject: [PATCH 4/8] some description --- .gitea/workflows/docker-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index 90f5dea..d477133 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -21,7 +21,7 @@ jobs: registry: git.schamagusa.de username: ${{ gitea.actor }} password: ${{ secrets.RELEASE_TOKEN }} - + # 'toLower()' is not implemented - name: Build and push Docker image uses: docker/build-push-action@v5 env: From a6f1c0e9675da2306166518458849a6b67a1d139 Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:35:28 +0200 Subject: [PATCH 5/8] fix: repo to Lower --- .gitea/workflows/docker-build.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index d477133..5b8797e 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -22,6 +22,13 @@ jobs: username: ${{ gitea.actor }} password: ${{ secrets.RELEASE_TOKEN }} # 'toLower()' is not implemented + - name: Repository kleinschreiben + id: lowercase + env: + REPO: ${{ gitea.repository }} + run: | + echo "repo=$(printf '%s' "$REPO" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT" + - name: Build and push Docker image uses: docker/build-push-action@v5 env: @@ -30,8 +37,8 @@ jobs: context: . push: true tags: | - git.schamagusa.de/${REPO,,}:${{ gitea.ref_name }} - git.schamagusa.de/${REPO,,}:latest + git.schamagusa.de/${{ steps.lowercase.outputs.repo }}:${{ gitea.ref_name }} + git.schamagusa.de/${{ steps.lowercase.outputs.repo }}:latest - name: Prepare release notes run: | From 799cc9597cac9c9a603c0a5bf7db55224265cdcc Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:36:40 +0200 Subject: [PATCH 6/8] Zeilen Falsch --- .gitea/workflows/docker-build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index 5b8797e..53c1a34 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -22,12 +22,12 @@ jobs: username: ${{ gitea.actor }} password: ${{ secrets.RELEASE_TOKEN }} # 'toLower()' is not implemented - - name: Repository kleinschreiben - id: lowercase - env: - REPO: ${{ gitea.repository }} - run: | - echo "repo=$(printf '%s' "$REPO" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT" + - name: Repository kleinschreiben + id: lowercase + env: + REPO: ${{ gitea.repository }} + run: | + echo "repo=$(printf '%s' "$REPO" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT" - name: Build and push Docker image uses: docker/build-push-action@v5 From e543c60ed54a4afdc2d7ed88f67577f519f1c3e6 Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:38:58 +0200 Subject: [PATCH 7/8] last visual fixes --- .gitea/workflows/docker-build.yaml | 4 ++-- CHANGELOG.md | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index 53c1a34..960ef46 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -25,9 +25,9 @@ jobs: - name: Repository kleinschreiben id: lowercase env: - REPO: ${{ gitea.repository }} + REPO: ${{ gitea.repository }} run: | - echo "repo=$(printf '%s' "$REPO" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT" + echo "repo=$(printf '%s' "$REPO" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT" - name: Build and push Docker image uses: docker/build-push-action@v5 diff --git a/CHANGELOG.md b/CHANGELOG.md index 51b81c2..b7c6def 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ -# Release {{VERSION}} This version includes a new workflow file, so the Releases come faster and better to you From 650a11231a756087220194c585731b59484cbd83 Mon Sep 17 00:00:00 2001 From: Rudi Date: Thu, 3 Sep 2026 17:49:18 +0200 Subject: [PATCH 8/8] Somw changes --- .gitea/workflows/docker-build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index 960ef46..24a49b0 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -9,6 +9,9 @@ on: jobs: build-and-push: runs-on: ubuntu-latest + permissions: + releases: write + packages: write steps: - name: Checkout uses: actions/checkout@v4