From 3a93bba9dd4163fbbf18dfa74ed84a032425ad35 Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 13:44:51 +0200 Subject: [PATCH 1/6] chore: add dependabot.yml for the Dockerfile --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..84c87d6 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" From 058ab457db1bafba5b5343ec476d098f3b55da4a Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 13:57:25 +0200 Subject: [PATCH 2/6] chore: add dependabot.yml for the Dockerfile --- .github/workflows/build-test-and-publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index 27d253b..2d56a13 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -1,5 +1,8 @@ name: Build, test, and publish on: + pull_request: + branches: + - main workflow_dispatch: inputs: distribution: @@ -81,6 +84,7 @@ jobs: IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} publish: + if: github.event_name == 'workflow_dispatch' runs-on: ubuntu-24.04 needs: build-and-test strategy: From 5a335259fb51e7bafe7dd93cc0fa2cb215bf3a3c Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 14:09:25 +0200 Subject: [PATCH 3/6] chore: add dependabot.yml for the Dockerfile --- .github/workflows/build-test-and-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index 2d56a13..ef0e362 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -38,6 +38,9 @@ on: types: [published] jobs: build-and-test: + env: + version: '1.0.0-beta-4' + snapshot: false runs-on: ubuntu-24.04 strategy: fail-fast: false From 5ea6fdb7d342d8df4f932550ce4ca245473836a2 Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 14:10:39 +0200 Subject: [PATCH 4/6] chore: add dependabot.yml for the Dockerfile --- .github/workflows/build-test-and-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index ef0e362..ecb9ff2 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -39,8 +39,8 @@ on: jobs: build-and-test: env: - version: '1.0.0-beta-4' - snapshot: false + VERSION: '1.0.0-beta-4' + SNAPSHOT: false runs-on: ubuntu-24.04 strategy: fail-fast: false From 19374042d04002769552d42db99200a15ac2718f Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 14:12:56 +0200 Subject: [PATCH 5/6] chore: add dependabot.yml for the Dockerfile --- .github/workflows/build-test-and-publish.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index ecb9ff2..58b8563 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -38,15 +38,14 @@ on: types: [published] jobs: build-and-test: - env: - VERSION: '1.0.0-beta-4' - SNAPSHOT: false runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: DISTRO: ${{ fromJson(github.event.inputs.distribution || '["run", "tomcat"]') }} PLATFORM: ${{ fromJson(github.event.inputs.platform || '["amd64", "arm64"]') }} + VERSION: ["1.0.0-beta-4"] + SNAPSHOT: ["false"] steps: - name: Checkout uses: actions/checkout@v4 From bfb7264ead4a2f28b14edfb7c1477327043a1ca3 Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 14:15:20 +0200 Subject: [PATCH 6/6] chore: add dependabot.yml for the Dockerfile --- .github/workflows/build-test-and-publish.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index 58b8563..d8fc2a2 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -44,8 +44,6 @@ jobs: matrix: DISTRO: ${{ fromJson(github.event.inputs.distribution || '["run", "tomcat"]') }} PLATFORM: ${{ fromJson(github.event.inputs.platform || '["amd64", "arm64"]') }} - VERSION: ["1.0.0-beta-4"] - SNAPSHOT: ["false"] steps: - name: Checkout uses: actions/checkout@v4 @@ -71,8 +69,8 @@ jobs: env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} - VERSION: ${{ github.event.inputs.version || '' }} - SNAPSHOT: ${{ github.event.inputs.snapshot || '' }} + VERSION: ${{ github.event.inputs.version || '1.0.0-beta-4' }} + SNAPSHOT: ${{ github.event.inputs.snapshot || 'false' }} IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} - name: Test @@ -81,8 +79,8 @@ jobs: env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} - VERSION: ${{ github.event.inputs.version || '' }} - SNAPSHOT: ${{ github.event.inputs.snapshot || '' }} + VERSION: ${{ github.event.inputs.version || '1.0.0-beta-4' }} + SNAPSHOT: ${{ github.event.inputs.snapshot || 'false' }} IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} publish: