From 4fcde8b7ea60a97b35ba8c21f9cec24b9fbf0bee Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 14:52:46 +0200 Subject: [PATCH 01/14] chore: add dependabot.yml for the Dockerfile - fix missing wildfly repo URLs --- .github/dependabot.yml | 6 +++ .github/workflows/build-test-and-publish.yml | 2 + .github/workflows/pull-request-build-test.yml | 53 +++++++++++++++++++ test/test.sh | 2 + 4 files changed, 63 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/pull-request-build-test.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" diff --git a/.github/workflows/build-test-and-publish.yml b/.github/workflows/build-test-and-publish.yml index 27d253b..2ab6514 100644 --- a/.github/workflows/build-test-and-publish.yml +++ b/.github/workflows/build-test-and-publish.yml @@ -70,6 +70,7 @@ jobs: SNAPSHOT: ${{ github.event.inputs.snapshot || '' }} IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} + IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} - name: Test run: ./test.sh working-directory: test @@ -80,6 +81,7 @@ jobs: SNAPSHOT: ${{ github.event.inputs.snapshot || '' }} IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} + IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} publish: runs-on: ubuntu-24.04 needs: build-and-test diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml new file mode 100644 index 0000000..2df8fe8 --- /dev/null +++ b/.github/workflows/pull-request-build-test.yml @@ -0,0 +1,53 @@ +on: + pull_request: + branches: + - main +jobs: + build-and-test: + runs-on: ubuntu-24.04 + strategy: + fail-fast: false + matrix: + DISTRO: ["run"] + PLATFORM: ["amd64"] + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + if: ${{ matrix.PLATFORM != 'amd64' }} + with: + platforms: ${{ matrix.PLATFORM }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Expose GitHub Runtime + uses: actions/github-script@v7 + with: + script: | + Object.keys(process.env).forEach(function (key) { + if (key.startsWith('ACTIONS_')) { + core.info(`${key}=${process.env[key]}`); + core.exportVariable(key, process.env[key]); + } + }); + - name: Build + run: ./pipeline.sh + env: + DISTRO: ${{ matrix.DISTRO }} + PLATFORM: ${{ matrix.PLATFORM }} + VERSION: 1.0.0-beta-4 + SNAPSHOT: false + IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} + IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} + IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} + - name: Test + run: ./test.sh + working-directory: test + env: + DISTRO: ${{ matrix.DISTRO }} + PLATFORM: ${{ matrix.PLATFORM }} + VERSION: 1.0.0-beta-4 + SNAPSHOT: false + IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} + IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} + IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} diff --git a/test/test.sh b/test/test.sh index d9c7570..a6bc917 100755 --- a/test/test.sh +++ b/test/test.sh @@ -4,6 +4,8 @@ if [ "$DISTRO" == "run" ]; then IMAGE_NAME=${IMAGE_REPO_OPERATON}:${PLATFORM} elif [ "$DISTRO" == "tomcat" ]; then IMAGE_NAME=${IMAGE_REPO_TOMCAT}:${PLATFORM} +elif [ "$DISTRO" == "wildfly" ]; then + IMAGE_NAME=${IMAGE_REPO_WILDFLY}:${PLATFORM} fi export IMAGE_NAME From 36f992f02a4a8d6f4c17289835acfa85bc4fe732 Mon Sep 17 00:00:00 2001 From: Jaye Date: Mon, 30 Jun 2025 15:58:15 +0200 Subject: [PATCH 02/14] chore: print out DISTRO and IMAGE_REPO_URL --- pipeline.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pipeline.sh b/pipeline.sh index e90e7ac..9c99612 100755 --- a/pipeline.sh +++ b/pipeline.sh @@ -20,6 +20,8 @@ elif [ "$DISTRO" == "wildfly" ]; then IMAGE_NAME=${IMAGE_REPO_WILDFLY}:${PLATFORM} fi +echo "Using distro $DISTRO with repo URL $IMAGE_REPO_OPERATON" + docker buildx build . \ -t "${IMAGE_NAME}" \ --platform linux/${PLATFORM} \ From d7cbb61e6e5753dd6e6a7de0f035c0d95b8ac957 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 10:08:40 +0200 Subject: [PATCH 03/14] chore: print out repo vars --- .github/workflows/pull-request-build-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 2df8fe8..aa0c7f4 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -31,7 +31,11 @@ jobs: } }); - name: Build - run: ./pipeline.sh + run: | + echo "IMAGE_REPO_OPERATON=$IMAGE_REPO_OPERATON" + echo "IMAGE_REPO_TOMCAT=$IMAGE_REPO_TOMCAT" + echo "IMAGE_REPO_WILDFLY=$IMAGE_REPO_WILDFLY" + ./pipeline.sh env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} From c8cde8c884b02a9ffff71c62c8373cb9675ced13 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 11:34:22 +0200 Subject: [PATCH 04/14] chore: print out repo vars --- .github/workflows/pull-request-build-test.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index aa0c7f4..0a5737b 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -31,11 +31,6 @@ jobs: } }); - name: Build - run: | - echo "IMAGE_REPO_OPERATON=$IMAGE_REPO_OPERATON" - echo "IMAGE_REPO_TOMCAT=$IMAGE_REPO_TOMCAT" - echo "IMAGE_REPO_WILDFLY=$IMAGE_REPO_WILDFLY" - ./pipeline.sh env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} @@ -44,6 +39,14 @@ jobs: IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} + run: | + echo "IMAGE_REPO_OPERATON=$IMAGE_REPO_OPERATON" + echo "IMAGE_REPO_TOMCAT=$IMAGE_REPO_TOMCAT" + echo "IMAGE_REPO_WILDFLY=$IMAGE_REPO_WILDFLY" + echo "vars.IMAGE_REPO_OPERATON=${{ vars.IMAGE_REPO_OPERATON }}" + echo "vars.IMAGE_REPO_TOMCAT=${{ vars.IMAGE_REPO_TOMCAT }}" + echo "vars.IMAGE_REPO_WILDFLY=${{ vars.IMAGE_REPO_WILDFLY }}" + ./pipeline.sh - name: Test run: ./test.sh working-directory: test From bd6020880fe27f6fb4fbe9d98e1b56fa00d905d7 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 11:46:05 +0200 Subject: [PATCH 05/14] chore: print out repo vars --- .github/workflows/pull-request-build-test.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 0a5737b..15e5438 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -1,3 +1,4 @@ +name: Build and Test on: pull_request: branches: @@ -10,6 +11,14 @@ jobs: matrix: DISTRO: ["run"] PLATFORM: ["amd64"] + env: + DISTRO: ${{ matrix.DISTRO }} + PLATFORM: ${{ matrix.PLATFORM }} + VERSION: 1.0.0-beta-4 + SNAPSHOT: false + IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} + IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} + IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} steps: - name: Checkout uses: actions/checkout@v4 @@ -31,14 +40,6 @@ jobs: } }); - name: Build - env: - DISTRO: ${{ matrix.DISTRO }} - PLATFORM: ${{ matrix.PLATFORM }} - VERSION: 1.0.0-beta-4 - SNAPSHOT: false - IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} - IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} - IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} run: | echo "IMAGE_REPO_OPERATON=$IMAGE_REPO_OPERATON" echo "IMAGE_REPO_TOMCAT=$IMAGE_REPO_TOMCAT" From 5756a357e235faa41ed3183ee46d29dce8e83f50 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 11:49:42 +0200 Subject: [PATCH 06/14] chore: print out repo vars --- .github/workflows/pull-request-build-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 15e5438..62e70ee 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -1,8 +1,6 @@ name: Build and Test on: pull_request: - branches: - - main jobs: build-and-test: runs-on: ubuntu-24.04 From 826fbc56490b5823af5747cf76cc45d38b35a1c5 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 11:55:55 +0200 Subject: [PATCH 07/14] chore: print out repo vars --- .github/workflows/pull-request-build-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 62e70ee..99f1bba 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -1,6 +1,8 @@ name: Build and Test on: - pull_request: + pull_request_target: + branches: + - main jobs: build-and-test: runs-on: ubuntu-24.04 From 06939152c956df9bb18b5c9fd924ade61d1f9cb8 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 12:25:03 +0200 Subject: [PATCH 08/14] chore: print out repo vars --- .github/workflows/pull-request-build-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 99f1bba..764d539 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -59,3 +59,5 @@ jobs: IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} + + From d12fa9a1aa9997c8689e73089b37c3645d0e7101 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 12:32:04 +0200 Subject: [PATCH 09/14] chore: use hardcoded repos --- .github/workflows/pull-request-build-test.yml | 29 ++++--------------- pipeline.sh | 2 -- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 764d539..14957d6 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -1,6 +1,6 @@ name: Build and Test on: - pull_request_target: + pull_request: branches: - main jobs: @@ -16,9 +16,9 @@ jobs: PLATFORM: ${{ matrix.PLATFORM }} VERSION: 1.0.0-beta-4 SNAPSHOT: false - IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} - IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} - IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} + IMAGE_REPO_OPERATON: operaton/operaton + IMAGE_REPO_TOMCAT: operaton/tomcat + IMAGE_REPO_WILDFLY: operaton/wildfly steps: - name: Checkout uses: actions/checkout@v4 @@ -40,24 +40,7 @@ jobs: } }); - name: Build - run: | - echo "IMAGE_REPO_OPERATON=$IMAGE_REPO_OPERATON" - echo "IMAGE_REPO_TOMCAT=$IMAGE_REPO_TOMCAT" - echo "IMAGE_REPO_WILDFLY=$IMAGE_REPO_WILDFLY" - echo "vars.IMAGE_REPO_OPERATON=${{ vars.IMAGE_REPO_OPERATON }}" - echo "vars.IMAGE_REPO_TOMCAT=${{ vars.IMAGE_REPO_TOMCAT }}" - echo "vars.IMAGE_REPO_WILDFLY=${{ vars.IMAGE_REPO_WILDFLY }}" - ./pipeline.sh + run: ./pipeline.sh - name: Test run: ./test.sh - working-directory: test - env: - DISTRO: ${{ matrix.DISTRO }} - PLATFORM: ${{ matrix.PLATFORM }} - VERSION: 1.0.0-beta-4 - SNAPSHOT: false - IMAGE_REPO_OPERATON: ${{ vars.IMAGE_REPO_OPERATON }} - IMAGE_REPO_TOMCAT: ${{ vars.IMAGE_REPO_TOMCAT }} - IMAGE_REPO_WILDFLY: ${{ vars.IMAGE_REPO_WILDFLY }} - - + working-directory: test \ No newline at end of file diff --git a/pipeline.sh b/pipeline.sh index 9c99612..e90e7ac 100755 --- a/pipeline.sh +++ b/pipeline.sh @@ -20,8 +20,6 @@ elif [ "$DISTRO" == "wildfly" ]; then IMAGE_NAME=${IMAGE_REPO_WILDFLY}:${PLATFORM} fi -echo "Using distro $DISTRO with repo URL $IMAGE_REPO_OPERATON" - docker buildx build . \ -t "${IMAGE_NAME}" \ --platform linux/${PLATFORM} \ From 1df5372b44d6485a2b4bfb496202f97bf1d9a5cd Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 12:40:46 +0200 Subject: [PATCH 10/14] chore: include tomcat and wildfly on tests as well --- .github/workflows/pull-request-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 14957d6..476551d 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - DISTRO: ["run"] + DISTRO: ["run", "tomcat", "wildfly"] PLATFORM: ["amd64"] env: DISTRO: ${{ matrix.DISTRO }} From 223162380b9afccfd36c7413674ed4bfea17c5eb Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 12:55:43 +0200 Subject: [PATCH 11/14] chore: test with 1.0.0-beta-3 --- .github/workflows/pull-request-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 476551d..7b7f326 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -14,7 +14,7 @@ jobs: env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} - VERSION: 1.0.0-beta-4 + VERSION: 1.0.0-beta-3 SNAPSHOT: false IMAGE_REPO_OPERATON: operaton/operaton IMAGE_REPO_TOMCAT: operaton/tomcat From b279e64d1cbf1a77695caca71f9c2a532dc27194 Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 13:37:43 +0200 Subject: [PATCH 12/14] chore: test with 1.0.0-beta-5 snapshot --- .github/workflows/pull-request-build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 7b7f326..1cdb2ba 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -14,8 +14,8 @@ jobs: env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} - VERSION: 1.0.0-beta-3 - SNAPSHOT: false + VERSION: 1.0.0-beta-5 + SNAPSHOT: true IMAGE_REPO_OPERATON: operaton/operaton IMAGE_REPO_TOMCAT: operaton/tomcat IMAGE_REPO_WILDFLY: operaton/wildfly From 65f52c0dbb35b7e9bb6435f2899f1bd04c92eddb Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 14:07:22 +0200 Subject: [PATCH 13/14] chore: test with 1.0.0-beta-4 --- .github/workflows/pull-request-build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 1cdb2ba..476551d 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -14,8 +14,8 @@ jobs: env: DISTRO: ${{ matrix.DISTRO }} PLATFORM: ${{ matrix.PLATFORM }} - VERSION: 1.0.0-beta-5 - SNAPSHOT: true + VERSION: 1.0.0-beta-4 + SNAPSHOT: false IMAGE_REPO_OPERATON: operaton/operaton IMAGE_REPO_TOMCAT: operaton/tomcat IMAGE_REPO_WILDFLY: operaton/wildfly From 868af6efed906abe2d3e0855e5ba0cdd616165fe Mon Sep 17 00:00:00 2001 From: Jaye Date: Tue, 1 Jul 2025 14:50:04 +0200 Subject: [PATCH 14/14] chore: remove wildfly container testing temporarily --- .github/workflows/pull-request-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-build-test.yml b/.github/workflows/pull-request-build-test.yml index 476551d..52fd6b7 100644 --- a/.github/workflows/pull-request-build-test.yml +++ b/.github/workflows/pull-request-build-test.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - DISTRO: ["run", "tomcat", "wildfly"] + DISTRO: ["run", "tomcat"] PLATFORM: ["amd64"] env: DISTRO: ${{ matrix.DISTRO }}