From 37d04bf109d8e664b964682b19e23f3e57585a9e Mon Sep 17 00:00:00 2001 From: USER Date: Sat, 18 Oct 2025 12:44:58 +0100 Subject: [PATCH] . --- .gitea/workflows/caller.yml | 12 ------------ .../workflows => workflows}/build_containerORIG.yml | 0 .../build_container_reusable1.yml | 0 {.gitea/workflows => workflows}/called.yml | 10 +++++----- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 .gitea/workflows/caller.yml rename {.gitea/workflows => workflows}/build_containerORIG.yml (100%) rename {.gitea/workflows => workflows}/build_container_reusable1.yml (100%) rename {.gitea/workflows => workflows}/called.yml (92%) diff --git a/.gitea/workflows/caller.yml b/.gitea/workflows/caller.yml deleted file mode 100644 index eb26ed2..0000000 --- a/.gitea/workflows/caller.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: CI Workflow - -on: [push] - -jobs: - build_push: - uses: ./.github/workflows/build_push_container.yml - with: - registry: ${{ secrets.MY_REGISTRY }} - registry_username: ${{ secrets.MY_REGISTRY_USERNAME }} - registry_password: ${{ secrets.MY_REGISTRY_PASSWORD }} - titles: 'Your Image Title' # Specify any required titles or metadata if needed diff --git a/.gitea/workflows/build_containerORIG.yml b/workflows/build_containerORIG.yml similarity index 100% rename from .gitea/workflows/build_containerORIG.yml rename to workflows/build_containerORIG.yml diff --git a/.gitea/workflows/build_container_reusable1.yml b/workflows/build_container_reusable1.yml similarity index 100% rename from .gitea/workflows/build_container_reusable1.yml rename to workflows/build_container_reusable1.yml diff --git a/.gitea/workflows/called.yml b/workflows/called.yml similarity index 92% rename from .gitea/workflows/called.yml rename to workflows/called.yml index fc8db6d..0e0b96b 100644 --- a/.gitea/workflows/called.yml +++ b/workflows/called.yml @@ -15,6 +15,9 @@ on: titles: required: true type: string + osversion: + required: true + type: number jobs: build: @@ -23,9 +26,6 @@ jobs: DOCKER_ORG: teacup DOCKER_LATEST: nightly RUNNER_TOOL_CACHE: /toolcache - strategy: - matrix: - os: [3.20.0, 3.21.0, 3.22.0] steps: - name: "Build: checkout" uses: actions/checkout@v4 @@ -59,12 +59,12 @@ jobs: uses: docker/build-push-action@v5 with: build-args: | - VERSION=${{ matrix.os }} + VERSION=${{ inputs.osversion }} NAS_USER=dnke context: . push: true tags: | ${{ inputs.registry }}/${{ inputs.registry_username }}/${{ env.myTITLE }}:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} - ${{ inputs.registry }}/${{ inputs.registry_username }}/${{ env.myTITLE }}:${{ matrix.os }} + ${{ inputs.registry }}/${{ inputs.registry_username }}/${{ env.myTITLE }}:${{ inputs.osversion }} ${{ inputs.registry }}/${{ inputs.registry_username }}/${{ env.myTITLE }}:latest labels: ${{ steps.meta.outputs.labels }}