diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml index 0eff078..da7dc17 100644 --- a/.forgejo/workflows/build-push-jre-alpine.yml +++ b/.forgejo/workflows/build-push-jre-alpine.yml @@ -1,6 +1,8 @@ on: - workflow_dispatch: + [workflow_dispatch] push: + branches: + - 'main' tags: - 'jre-alpine*.**/v**' schedule: @@ -12,18 +14,7 @@ jobs: steps: - name: Checkout Repository - #uses: actions/checkout@v5 - #uses: https://github.com/yangskyboxlabs/action-checkout@sha256 - uses: https://git.nanody.de/anonoe/action-checkout@sha256 - with: - object-format: 'sha256' - - - name: Login to Container Registry - uses: docker/login-action@v3 - with: - registry: git.nanody.de - username: ${{ github.actor }} - password: ${{ secrets.PACKAGES_RW }} + uses: actions/checkout@v5 - name: Docker meta id: meta @@ -32,17 +23,16 @@ jobs: images: | git.nanody.de/anonoe/jre-alpine tags: | - type=schedule,pattern=nightly,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} + type=semver,pattern={{raw}}/{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}} type=semver,pattern={{version}},match=v(\d.\d.\d)$ type=semver,pattern={{major}}.{{minor}},match=v(\d.\d.\d)$ type=semver,pattern={{major}},match=v(\d.\d.\d)$ - # type=raw,suffix={{tag}}-{{commit_date 'YYYYMMDD-HHmmss' tz='Europe/Berlin'}},value= - name: Build and push jre-alpine uses: docker/build-push-action@v6 with: context: ./server/buildenv-jre-alpine/ file: ./server/buildenv-jre-alpine/Containerfile - push: true + push: false tags: ${{ steps.meta.outputs.tags }} - #labels: ${{ steps.meta.outputs.labels }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/server/buildenv-jre-alpine/Containerfile b/server/buildenv-jre-alpine/Containerfile index 26fcaa3..4105cb9 100644 --- a/server/buildenv-jre-alpine/Containerfile +++ b/server/buildenv-jre-alpine/Containerfile @@ -1,3 +1,3 @@ -FROM alpine:3.22 +FROM alpine:3.20 RUN apk add --no-cache openjdk21-jre-headless rcon