From 786805a4190b0cd7577f9dbce7f2682c27d5f67b Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 26 Feb 2026 09:21:29 +0000 Subject: [PATCH 1/9] Upgrade Java runtime to 17 and add container startup verification - Update all Dockerfiles (standard and Alpine, release and nightly) to use eclipse-temurin:17-jre / eclipse-temurin:17-jre-alpine as the runtime base - Update nightly build stage from gradle:7-jdk11 to gradle:8-jdk17 - Bump java.version in integration-tests/pom.xml from 11 to 17 - Upgrade CI workflow JDK setup from Java 11 to 17 - Add "Verify container startup" step in ci.yml: starts the freshly built image, polls /__admin/health until it responds (30s timeout), then stops and removes the container to confirm the image boots correctly https://claude.ai/code/session_01Pjv2CpfE3we7Tcva58sgUg --- .github/workflows/ci.yml | 10 +++++++++- Dockerfile | 2 +- Dockerfile-nightly | 4 ++-- alpine/Dockerfile | 2 +- alpine/Dockerfile-nightly | 4 ++-- test/integration-tests/pom.xml | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f264d0a..46005e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,10 +59,18 @@ jobs: - name: Build Wiremock Docker image run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile + - name: Verify container startup + run: | + docker run -d --name wiremock-test -p 8080:8080 ${{ matrix.versions.TAGS[0] }} + timeout 30 bash -c 'until curl -sf http://localhost:8080/__admin/health; do sleep 1; done' + echo "WireMock container started and health check passed" + docker stop wiremock-test + docker rm wiremock-test + - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: maven diff --git a/Dockerfile b/Dockerfile index b8403a6..7faa9bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11.0.24_8-jre +FROM eclipse-temurin:17-jre LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/Dockerfile-nightly b/Dockerfile-nightly index 73d7bab..9f833b1 100644 --- a/Dockerfile-nightly +++ b/Dockerfile-nightly @@ -1,6 +1,6 @@ # BUILD -FROM gradle:7-jdk11 AS builder +FROM gradle:8-jdk17 AS builder WORKDIR /workdir @@ -12,7 +12,7 @@ RUN ./gradlew shadowJar # RUN -FROM eclipse-temurin:11.0.24_8-jre +FROM eclipse-temurin:17-jre LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 5749109..939c350 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-jre-alpine +FROM eclipse-temurin:17-jre-alpine LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/alpine/Dockerfile-nightly b/alpine/Dockerfile-nightly index 70d0a82..bb81c44 100644 --- a/alpine/Dockerfile-nightly +++ b/alpine/Dockerfile-nightly @@ -1,6 +1,6 @@ # BUILD -FROM gradle:7-jdk11 AS builder +FROM gradle:8-jdk17 AS builder WORKDIR /workdir @@ -10,7 +10,7 @@ RUN ./gradlew shadowJar # RUN -FROM eclipse-temurin:11.0.20_8-jre-alpine +FROM eclipse-temurin:17-jre-alpine LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml index 9615b1a..81c4942 100644 --- a/test/integration-tests/pom.xml +++ b/test/integration-tests/pom.xml @@ -16,7 +16,7 @@ - 11 + 17 ${java.version} ${java.version} 1.0-alpha-13 From ec7fb8a0909713e5279226c8bd3d56be5643dd75 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 26 Feb 2026 09:29:55 +0000 Subject: [PATCH 2/9] Scope Java 17 upgrade and startup test to 4.x beta workflow only - Revert ci.yml JDK setup back to 11 and remove the startup test step that was incorrectly added to the generic CI workflow - Add verify-container-startup job to release-4.x-beta.yml: builds the standard image locally (amd64) with the bundled WireMock version, starts the container, polls /__admin/health until it responds (30s timeout), then stops and removes it - Make docker-build-push depend on verify-container-startup so the multi-platform push only happens after the container is confirmed healthy https://claude.ai/code/session_01Pjv2CpfE3we7Tcva58sgUg --- .github/workflows/ci.yml | 10 +-------- .github/workflows/release-4.x-beta.yml | 31 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46005e8..f264d0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,18 +59,10 @@ jobs: - name: Build Wiremock Docker image run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile - - name: Verify container startup - run: | - docker run -d --name wiremock-test -p 8080:8080 ${{ matrix.versions.TAGS[0] }} - timeout 30 bash -c 'until curl -sf http://localhost:8080/__admin/health; do sleep 1; done' - echo "WireMock container started and health check passed" - docker stop wiremock-test - docker rm wiremock-test - - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'temurin' cache: maven diff --git a/.github/workflows/release-4.x-beta.yml b/.github/workflows/release-4.x-beta.yml index 035d9d1..004c176 100644 --- a/.github/workflows/release-4.x-beta.yml +++ b/.github/workflows/release-4.x-beta.yml @@ -28,10 +28,39 @@ jobs: LATEST_VERSION=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/wiremock/wiremock.git '4.*.*' | tail -1 | cut -d '/' -f3) echo "NEW_VERSION=${{ github.event.inputs.bundled-version }}-${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT - docker-build-push: + verify-container-startup: runs-on: ubuntu-latest needs: [check-new-version] if: needs.check-new-version.outputs.new_version + steps: + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Checkout sources + uses: actions/checkout@main + + - name: Build WireMock Docker image (local) + run: | + docker buildx build \ + --tag wiremock/wiremock:verify \ + --load \ + --build-arg "WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}" \ + --file Dockerfile \ + . + + - name: Verify container startup + run: | + docker run -d --name wiremock-test -p 8080:8080 wiremock/wiremock:verify + timeout 30 bash -c 'until curl -sf http://localhost:8080/__admin/health; do sleep 1; done' + echo "WireMock container started and health check passed" + docker stop wiremock-test + docker rm wiremock-test + + docker-build-push: + runs-on: ubuntu-latest + needs: [check-new-version, verify-container-startup] + if: needs.check-new-version.outputs.new_version strategy: matrix: versions: From 51363b24750a36a8faf1963fc9b97d7849fbba6d Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 26 Feb 2026 09:56:42 +0000 Subject: [PATCH 3/9] Parameterise Java version; default 11 (3.x), 17 for 4.x beta Instead of hard-coding a Java version in the Dockerfiles, introduce a JAVA_VERSION build arg that defaults to 11 so existing 3.x release workflows are unaffected. The release-4.x-beta.yml workflow passes JAVA_VERSION=17 in every build (both the local verify-container-startup build and the multi-platform docker-build-push). https://claude.ai/code/session_01Pjv2CpfE3we7Tcva58sgUg --- .github/workflows/release-4.x-beta.yml | 4 +++- Dockerfile | 3 ++- alpine/Dockerfile | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-4.x-beta.yml b/.github/workflows/release-4.x-beta.yml index 004c176..a91dd43 100644 --- a/.github/workflows/release-4.x-beta.yml +++ b/.github/workflows/release-4.x-beta.yml @@ -46,6 +46,7 @@ jobs: --tag wiremock/wiremock:verify \ --load \ --build-arg "WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}" \ + --build-arg "JAVA_VERSION=17" \ --file Dockerfile \ . @@ -125,7 +126,8 @@ jobs: push: true tags: ${{ join(matrix.versions.IMAGES, ',') }} build-args: | - "WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}" + WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }} + JAVA_VERSION=17 container-image-scan: uses: ./.github/workflows/container-image-scan.yml diff --git a/Dockerfile b/Dockerfile index 7faa9bc..1e605c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM eclipse-temurin:17-jre +ARG JAVA_VERSION=11 +FROM eclipse-temurin:${JAVA_VERSION}-jre LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 939c350..e3e5fbb 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,5 @@ -FROM eclipse-temurin:17-jre-alpine +ARG JAVA_VERSION=11 +FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine LABEL maintainer="Rodolphe CHAIGNEAU " From 387244ad88100c7a6b720dc55560ac6cbf942e3d Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 26 Feb 2026 10:52:48 +0000 Subject: [PATCH 4/9] Add Java 17 matrix entries to CI and wire JAVA_VERSION build arg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The integration tests (pom.xml java.version=17) require JDK 17 to compile, so running them under JDK 11 fails. Add two new matrix entries — standard and Alpine — with JAVA_VERSION: 17. Each entry passes JAVA_VERSION as a Docker build arg (so the correct JRE is baked into the image) and uses it for the actions/setup-java step (so Maven compiles and runs under the matching JDK). The existing JAVA_VERSION: 11 entries are preserved for continued 3.x coverage. https://claude.ai/code/session_01Pjv2CpfE3we7Tcva58sgUg --- .github/workflows/ci.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f264d0a..631a5a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: matrix: versions: - CONTEXT: . + JAVA_VERSION: 11 TAGS: - wiremock/wiremock:test PLATFORMS: @@ -21,10 +22,25 @@ jobs: - linux/arm64 - linux/arm/v7 - CONTEXT: alpine + JAVA_VERSION: 11 TAGS: - wiremock/wiremock:test-alpine PLATFORMS: - linux/amd64 + - CONTEXT: . + JAVA_VERSION: 17 + TAGS: + - wiremock/wiremock:test-java17 + PLATFORMS: + - linux/amd64 + - linux/arm64 + - linux/arm/v7 + - CONTEXT: alpine + JAVA_VERSION: 17 + TAGS: + - wiremock/wiremock:test-alpine-java17 + PLATFORMS: + - linux/amd64 steps: @@ -55,14 +71,15 @@ jobs: push: false file: ${{ matrix.versions.CONTEXT }}/Dockerfile tags: ${{ matrix.versions.TAGS[0] }} + build-args: JAVA_VERSION=${{ matrix.versions.JAVA_VERSION }} - name: Build Wiremock Docker image - run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile + run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=${{ matrix.versions.JAVA_VERSION }} - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: ${{ matrix.versions.JAVA_VERSION }} distribution: 'temurin' cache: maven From b9f6cfcfb80006534ed72e632816d926ff65e4ae Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 26 Feb 2026 10:58:32 +0000 Subject: [PATCH 5/9] Always use JDK 17 for integration tests regardless of container Java version The test runner JDK and the JRE inside the Docker container are independent. pom.xml targets Java 17 (source/target), so JDK 11 fails to compile with "invalid source release: 17". Fix by pinning the setup-java step to 17 for all matrix entries. JAVA_VERSION continues to control only the Docker build arg (i.e. which JRE is baked into the image being tested). https://claude.ai/code/session_01Pjv2CpfE3we7Tcva58sgUg --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 631a5a4..1bab750 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: ${{ matrix.versions.JAVA_VERSION }} + java-version: 17 distribution: 'temurin' cache: maven From 637165ebd88e4d545b51128cbc7bd89567f00d02 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 26 Feb 2026 12:07:08 +0000 Subject: [PATCH 6/9] Drop linux/arm/v7 from Java 17 build matrix Eclipse Temurin dropped 32-bit ARM (armv7/armhf) support in Java 17. eclipse-temurin:17-jre has no linux/arm/v7 manifest, so the multi-platform docker/build-push-action step was failing for that platform target. Java 17 matrix now builds only linux/amd64 and linux/arm64 (64-bit ARM), which are both supported. The Java 11 matrix continues to include linux/arm/v7 as before since eclipse-temurin:11-jre supports it. https://claude.ai/code/session_01Pjv2CpfE3we7Tcva58sgUg --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bab750..923b18b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,6 @@ jobs: PLATFORMS: - linux/amd64 - linux/arm64 - - linux/arm/v7 - CONTEXT: alpine JAVA_VERSION: 17 TAGS: From 87c045d43e26e1962663df21eab9b57a98997519 Mon Sep 17 00:00:00 2001 From: Tom Akehurst Date: Thu, 26 Feb 2026 13:27:40 +0000 Subject: [PATCH 7/9] Split out CI into 3 and 4.x versions --- .github/workflows/ci-4.x-beta.yml | 78 +++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 20 +------- 2 files changed, 80 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/ci-4.x-beta.yml diff --git a/.github/workflows/ci-4.x-beta.yml b/.github/workflows/ci-4.x-beta.yml new file mode 100644 index 0000000..49dce24 --- /dev/null +++ b/.github/workflows/ci-4.x-beta.yml @@ -0,0 +1,78 @@ +name: CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + workflow_dispatch: + +jobs: + docker-build: + runs-on: ubuntu-latest + strategy: + matrix: + versions: + - CONTEXT: . + TAGS: + - wiremock/wiremock:test + PLATFORMS: + - linux/amd64 + - linux/arm64 + - linux/arm/v7 + - CONTEXT: alpine + TAGS: + - wiremock/wiremock:test-alpine + PLATFORMS: + - linux/amd64 + + steps: + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + with: + image: tonistiigi/binfmt:latest + platforms: all + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Checkout sources + uses: actions/checkout@main + +# TODO: Re-enable if rate limit becomes an issues +# - name: Login to Docker Hub +# uses: docker/login-action@v2 +# with: +# username: wiremock +# password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Build WireMock Docker image + uses: docker/build-push-action@v4 + with: + context: ${{ matrix.versions.CONTEXT }} + platforms: ${{ join(matrix.versions.PLATFORMS, ',') }} + push: false + file: ${{ matrix.versions.CONTEXT }}/Dockerfile + tags: ${{ matrix.versions.TAGS[0] }} + + - name: Build Wiremock Docker image + run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17 + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'temurin' + cache: maven + + - name: Run integration test + working-directory: test/integration-tests + run: mvn -B -ntp package verify --file pom.xml -DargLine="-Dit.wiremock-image=${{ matrix.versions.TAGS[0] }}" + + container-image-scan: + uses: ./.github/workflows/container-image-scan.yml + needs: docker-build + with: + image_version: latest + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 923b18b..0169476 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: matrix: versions: - CONTEXT: . - JAVA_VERSION: 11 TAGS: - wiremock/wiremock:test PLATFORMS: @@ -22,24 +21,10 @@ jobs: - linux/arm64 - linux/arm/v7 - CONTEXT: alpine - JAVA_VERSION: 11 TAGS: - wiremock/wiremock:test-alpine PLATFORMS: - linux/amd64 - - CONTEXT: . - JAVA_VERSION: 17 - TAGS: - - wiremock/wiremock:test-java17 - PLATFORMS: - - linux/amd64 - - linux/arm64 - - CONTEXT: alpine - JAVA_VERSION: 17 - TAGS: - - wiremock/wiremock:test-alpine-java17 - PLATFORMS: - - linux/amd64 steps: @@ -70,15 +55,14 @@ jobs: push: false file: ${{ matrix.versions.CONTEXT }}/Dockerfile tags: ${{ matrix.versions.TAGS[0] }} - build-args: JAVA_VERSION=${{ matrix.versions.JAVA_VERSION }} - name: Build Wiremock Docker image - run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=${{ matrix.versions.JAVA_VERSION }} + run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=11 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'temurin' cache: maven From c052075ff23134e7ddd481d9fc82844e592f0233 Mon Sep 17 00:00:00 2001 From: Tom Akehurst Date: Thu, 26 Feb 2026 13:31:54 +0000 Subject: [PATCH 8/9] Reverted to Java 11 for integration tests --- .github/workflows/ci-4.x-beta.yml | 2 +- test/integration-tests/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-4.x-beta.yml b/.github/workflows/ci-4.x-beta.yml index 49dce24..1972103 100644 --- a/.github/workflows/ci-4.x-beta.yml +++ b/.github/workflows/ci-4.x-beta.yml @@ -1,4 +1,4 @@ -name: CI +name: CI - 4.x-beta on: push: diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml index 81c4942..9615b1a 100644 --- a/test/integration-tests/pom.xml +++ b/test/integration-tests/pom.xml @@ -16,7 +16,7 @@ - 17 + 11 ${java.version} ${java.version} 1.0-alpha-13 From b4ed1a25d926b33c18840a3eba2f3a245222fcfb Mon Sep 17 00:00:00 2001 From: Tom Akehurst Date: Thu, 26 Feb 2026 13:58:14 +0000 Subject: [PATCH 9/9] Attempt at making everything Java 17 - both the 3.x and 4.x builds --- .github/workflows/ci-4.x-beta.yml | 4 +++- .github/workflows/ci.yml | 6 ++++-- .github/workflows/main.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 3 ++- .gitignore | 2 ++ Dockerfile | 2 +- alpine/Dockerfile | 2 +- test/integration-tests/pom.xml | 2 +- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-4.x-beta.yml b/.github/workflows/ci-4.x-beta.yml index 1972103..ced9709 100644 --- a/.github/workflows/ci-4.x-beta.yml +++ b/.github/workflows/ci-4.x-beta.yml @@ -55,9 +55,11 @@ jobs: push: false file: ${{ matrix.versions.CONTEXT }}/Dockerfile tags: ${{ matrix.versions.TAGS[0] }} + build-args: | + WIREMOCK_VERSION=4.0.0-beta.29 - name: Build Wiremock Docker image - run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17 + run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17 --build-arg WIREMOCK_VERSION=4.0.0-beta.29 - name: Set up JDK uses: actions/setup-java@v3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0169476..e60c179 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,14 +55,16 @@ jobs: push: false file: ${{ matrix.versions.CONTEXT }}/Dockerfile tags: ${{ matrix.versions.TAGS[0] }} + build-args: | + WIREMOCK_VERSION=3.13.2 - name: Build Wiremock Docker image - run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=11 + run: docker buildx build --tag ${{ matrix.versions.TAGS[0] }} --load ${{ matrix.versions.CONTEXT }} --file ${{ matrix.versions.CONTEXT }}/Dockerfile --build-arg JAVA_VERSION=17 --build-arg WIREMOCK_VERSION=3.13.2 - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: maven diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6126509..e4b19c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,7 +65,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: maven diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4396ba2..b133170 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -66,7 +66,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: 'temurin' cache: maven diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcbe84a..56f382c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,7 +95,8 @@ jobs: push: true tags: ${{ join(matrix.versions.IMAGES, ',') }} build-args: | - "WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}" + WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }} + JAVA_VERSION=17 container-image-scan: uses: ./.github/workflows/container-image-scan.yml diff --git a/.gitignore b/.gitignore index c6a5f72..b8c747d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ test/integration-tests/target test/integration-tests/integration-tests.iml + +.claude \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1e605c3..e678063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG JAVA_VERSION=11 +ARG JAVA_VERSION=17 FROM eclipse-temurin:${JAVA_VERSION}-jre LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/alpine/Dockerfile b/alpine/Dockerfile index e3e5fbb..4554080 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -ARG JAVA_VERSION=11 +ARG JAVA_VERSION=17 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml index 9615b1a..81c4942 100644 --- a/test/integration-tests/pom.xml +++ b/test/integration-tests/pom.xml @@ -16,7 +16,7 @@ - 11 + 17 ${java.version} ${java.version} 1.0-alpha-13