Merge pull request #74 from wiremock/3.x

WireMock 3.x Docker images

Author: oleg-nenashev

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "3.x" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "3.x" ]
   workflow_dispatch:
 
 jobs:

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: Main
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, "3.x" ]
 
   workflow_dispatch:
 
@@ -15,16 +15,16 @@ jobs:
         versions:
           - CONTEXT: .
             TAGS:
-              - wiremock/wiremock:main
-              - ghcr.io/wiremock/wiremock:main
+              - wiremock/wiremock:3x
+              - ghcr.io/wiremock/wiremock:3x
             PLATFORMS:
               - linux/amd64
               - linux/arm64
               - linux/arm/v7
           - CONTEXT: alpine
             TAGS:
-              - wiremock/wiremock:main-alpine
-              - ghcr.io/wiremock/wiremock:main-alpine
+              - wiremock/wiremock:3x-alpine
+              - ghcr.io/wiremock/wiremock:3x-alpine
             PLATFORMS:
               - linux/amd64
     steps:

.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
       bundled-version:
         description: 'Bundled WireMock version'
         required: true
-        default: 2.35.0
+        default: 3.0.0
 
 jobs:
 
@@ -38,6 +38,7 @@ jobs:
           - CONTEXT: .
             IMAGES:
               - wiremock/wiremock:latest
+              - wiremock/wiremock:3x
               - wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}
               - ghcr.io/wiremock/wiremock:latest
               - ghcr.io/wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}
@@ -48,6 +49,7 @@ jobs:
           - CONTEXT: alpine
             IMAGES:
               - wiremock/wiremock:latest-alpine
+              - wiremock/wiremock:3x-alpine
               - wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}-alpine
               - ghcr.io/wiremock/wiremock:latest-alpine
               - ghcr.io/wiremock/wiremock:${{ needs.check-new-version.outputs.new_version }}-alpine

Dockerfile

@@ -2,7 +2,7 @@ FROM eclipse-temurin:11.0.19_7-jre
 
 LABEL maintainer="Rodolphe CHAIGNEAU <rodolphe.chaigneau@gmail.com>"
 
-ARG WIREMOCK_VERSION=2.35.0
+ARG WIREMOCK_VERSION=3.0.0
 ENV WIREMOCK_VERSION $WIREMOCK_VERSION
 ENV GOSU_VERSION 1.14
 
@@ -45,8 +45,8 @@ RUN set -eux; \
 
 # grab wiremock standalone jar
 RUN mkdir -p /var/wiremock/lib/ \
-  && curl https://repo1.maven.org/maven2/com/github/tomakehurst/wiremock-jre8-standalone/$WIREMOCK_VERSION/wiremock-jre8-standalone-$WIREMOCK_VERSION.jar \
-    -o /var/wiremock/lib/wiremock-jre8-standalone.jar
+  && curl https://repo1.maven.org/maven2/org/wiremock/wiremock-standalone/$WIREMOCK_VERSION/wiremock-standalone-$WIREMOCK_VERSION.jar \
+    -o /var/wiremock/lib/wiremock-standalone.jar
 
 # Init WireMock files structure
 RUN mkdir -p /home/wiremock/mappings && \

Dockerfile-nightly

@@ -18,7 +18,7 @@ LABEL maintainer="Rodolphe CHAIGNEAU <rodolphe.chaigneau@gmail.com>"
 
 WORKDIR /home/wiremock
 
-COPY --from=builder /workdir/build/libs/*.jar /var/wiremock/lib/wiremock-jre8-standalone.jar
+COPY --from=builder /workdir/build/libs/*.jar /var/wiremock/lib/wiremock-standalone.jar
 
 COPY docker-entrypoint.sh /
 

alpine/Dockerfile

@@ -2,7 +2,7 @@ FROM eclipse-temurin:11.0.19_7-jre-alpine
 
 LABEL maintainer="Rodolphe CHAIGNEAU <rodolphe.chaigneau@gmail.com>"
 
-ARG WIREMOCK_VERSION=2.35.0
+ARG WIREMOCK_VERSION=3.0.0
 ENV WIREMOCK_VERSION $WIREMOCK_VERSION
 
 WORKDIR /home/wiremock
@@ -15,8 +15,8 @@ RUN apk add --no-cache 'su-exec>=0.2' bash
 
 # grab wiremock standalone jar
 RUN mkdir -p /var/wiremock/lib/ \
-  && wget https://repo1.maven.org/maven2/com/github/tomakehurst/wiremock-jre8-standalone/$WIREMOCK_VERSION/wiremock-jre8-standalone-$WIREMOCK_VERSION.jar \
-    -O /var/wiremock/lib/wiremock-jre8-standalone.jar
+  && wget https://repo1.maven.org/maven2/org/wiremock/wiremock-standalone/$WIREMOCK_VERSION/wiremock-standalone-$WIREMOCK_VERSION.jar \
+    -O /var/wiremock/lib/wiremock-standalone.jar
 
 # Init WireMock files structure
 RUN mkdir -p /home/wiremock/mappings && \

alpine/Dockerfile-nightly

@@ -22,7 +22,7 @@ RUN apk add --update openssl
 # and bash
 RUN apk add --no-cache 'su-exec>=0.2' bash
 
-COPY --from=builder /workdir/build/libs/*.jar /var/wiremock/lib/wiremock-jre8-standalone.jar
+COPY --from=builder /workdir/build/libs/*.jar /var/wiremock/lib/wiremock-standalone.jar
 
 # Init WireMock files structure
 RUN mkdir -p /home/wiremock/mappings && \

alpine/docker-entrypoint.sh

@@ -4,7 +4,7 @@ set -e
 
 # Set `java` command if needed
 if [ "$1" = "" -o "${1#-}" != "$1" ]; then
-  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* com.github.tomakehurst.wiremock.standalone.WireMockServerRunner "$@"
+  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* wiremock.Run "$@"
 fi
 
 # allow the container to be started with `-e uid=`

docker-entrypoint.sh

@@ -4,7 +4,7 @@ set -e
 
 # Set `java` command if needed
 if [ "$1" = "" -o "${1:0:1}" = "-" ]; then
-  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* com.github.tomakehurst.wiremock.standalone.WireMockServerRunner "$@"
+  set -- java $JAVA_OPTS -cp /var/wiremock/lib/*:/var/wiremock/extensions/* wiremock.Run "$@"
 fi
 
 # allow the container to be started with `-e uid=`

readme.md

@@ -4,21 +4,28 @@
 
 > [WireMock](http://wiremock.org) Standalone server Docker image
 
-## Supported tags :
+## Supported tags
 
-### Latest
+### Latest images
 
-- `2.35.0-1`, `latest` [(2.35/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/2.35.0-1/Dockerfile)
-- `2.35.0-1-alpine`, `latest-alpine` [(2.35-alpine/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/2.35.0-1/alpine/Dockerfile)
+- `3.0.0-1` [(3.0.0-1/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/3.0.0-1/Dockerfile)
+- `3.0.0-1-alpine` [(2.35-alpine/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/3.0.0-1/alpine/Dockerfile)
+- `latest` [(latest/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/latest/Dockerfile)
+- `latest-alpine` [(latest-alpine/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/latest-alpine/Dockerfile)
 - `main` [(main/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/main/Dockerfile)
 - `main-alpine` [(main-alpine/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/main/alpine/Dockerfile)
 - `nightly` [(main/Dockerfile-nightly)](https://github.com/wiremock/wiremock-docker/blob/main/Dockerfile-nightly)
 - `nightly-alpine` [(main-alpine/Dockerfile-nightly)](https://github.com/wiremock/wiremock-docker/blob/main/alpine/Dockerfile-nightly)
 
-### Experimental WireMock 3.x Beta images
+### Latest WireMock 2.x images
 
-- `3x`- Latest WireMock 3.x image, with bundled Java 11
-- `3x-alpine` - Latest WireMock alpine 3.x image, with bundled Java 11
+- `2.35.0-1 [(2.35/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/2.35.0-1/Dockerfile)
+- `2.35.0-1-alpine` [(2.35-alpine/Dockerfile)](https://github.com/wiremock/wiremock-docker/blob/2.35.0-1/alpine/Dockerfile)
+
+### Deprecated tags
+
+- `3x`- Latest WireMock 3.x image, with bundled Java 11 - now `latest`
+- `3x-alpine` - Latest WireMock alpine 3.x image, with bundled Java 11 - now `latest`
 
 ### Complete list