diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f264d0a..c766a46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: [ "main" ] pull_request: + types: [ 'opened', 'synchronize' ] branches: [ "main" ] workflow_dispatch: @@ -18,8 +19,7 @@ jobs: - wiremock/wiremock:test PLATFORMS: - linux/amd64 - - linux/arm64 - - linux/arm/v7 + - linux/arm64/v8 - CONTEXT: alpine TAGS: - wiremock/wiremock:test-alpine @@ -27,13 +27,13 @@ jobs: - 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 @@ -65,7 +65,7 @@ jobs: java-version: 11 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] }}" @@ -75,4 +75,4 @@ jobs: needs: docker-build with: image_version: latest - secrets: inherit \ No newline at end of file + secrets: inherit diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6126509..747620e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,8 +19,7 @@ jobs: - ghcr.io/wiremock/wiremock:3x PLATFORMS: - linux/amd64 - - linux/arm64 - - linux/arm/v7 + - linux/arm64/v8 - CONTEXT: alpine TAGS: - wiremock/wiremock:3x-alpine @@ -68,7 +67,7 @@ jobs: java-version: 11 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] }}" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4426bd4..73f2d55 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -19,8 +19,7 @@ jobs: - ghcr.io/wiremock/wiremock:nightly PLATFORMS: - linux/amd64 - - linux/arm64 - - linux/arm/v7 + - linux/arm64/v8 - CONTEXT: alpine TAGS: - wiremock/wiremock:nightly-alpine @@ -72,7 +71,7 @@ jobs: java-version: 11 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] }}" diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 615cb66..e2451ad 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -22,8 +22,7 @@ jobs: - ghcr.io/wiremock/wiremock:${{ github.event.inputs.tag }} PLATFORMS: - linux/amd64 - - linux/arm64 - - linux/arm/v7 + - linux/arm64/v8 - CONTEXT: alpine IMAGES: - wiremock/wiremock:latest-alpine diff --git a/.github/workflows/release-2.x.yml b/.github/workflows/release-2.x.yml index 3ca172a..768b515 100644 --- a/.github/workflows/release-2.x.yml +++ b/.github/workflows/release-2.x.yml @@ -42,8 +42,7 @@ jobs: - ghcr.io/wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }} PLATFORMS: - linux/amd64 - - linux/arm64 - - linux/arm/v7 + - linux/arm64/v8 - CONTEXT: alpine IMAGES: - wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}-alpine diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcbe84a..348dba7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,8 +45,7 @@ jobs: - ghcr.io/wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }} PLATFORMS: - linux/amd64 - - linux/arm64 - - linux/arm/v7 + - linux/arm64/v8 - CONTEXT: alpine IMAGES: - wiremock/wiremock:latest-alpine diff --git a/Dockerfile b/Dockerfile index d191959..f4e9f91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11.0.24_8-jre +FROM eclipse-temurin:24_36-jre LABEL maintainer="Rodolphe CHAIGNEAU " @@ -10,10 +10,11 @@ WORKDIR /home/wiremock # grab gosu for easy step-down from root RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends ca-certificates curl; \ # save list of currently installed packages for later so we can clean up savedAptMark="$(apt-mark showmanual)"; \ - apt-get update; \ - apt-get install -y --no-install-recommends ca-certificates wget; \ + apt-get install -y --no-install-recommends wget; \ if ! command -v gpg; then \ apt-get install -y --no-install-recommends gnupg2 dirmngr; \ elif gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \ diff --git a/Dockerfile-nightly b/Dockerfile-nightly index 73d7bab..387baef 100644 --- a/Dockerfile-nightly +++ b/Dockerfile-nightly @@ -12,7 +12,7 @@ RUN ./gradlew shadowJar # RUN -FROM eclipse-temurin:11.0.24_8-jre +FROM eclipse-temurin:24_36-jre LABEL maintainer="Rodolphe CHAIGNEAU " diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 7be66eb..da8d21a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-jre-alpine +FROM eclipse-temurin:24_36-jre-alpine-3.21 LABEL maintainer="Rodolphe CHAIGNEAU " @@ -7,7 +7,7 @@ ENV WIREMOCK_VERSION=$WIREMOCK_VERSION WORKDIR /home/wiremock -RUN apk add --update openssl +RUN apk add --update openssl libexpat # grab su-exec for easy step-down from root # and bash diff --git a/alpine/Dockerfile-nightly b/alpine/Dockerfile-nightly index 70d0a82..be6b7e4 100644 --- a/alpine/Dockerfile-nightly +++ b/alpine/Dockerfile-nightly @@ -10,13 +10,13 @@ RUN ./gradlew shadowJar # RUN -FROM eclipse-temurin:11.0.20_8-jre-alpine +FROM eclipse-temurin:24_36-jre-alpine-3.21 LABEL maintainer="Rodolphe CHAIGNEAU " WORKDIR /home/wiremock -RUN apk add --update openssl +RUN apk add --update openssl libexpat # grab su-exec for easy step-down from root # and bash