Skip to content

Commit

Permalink
Update to WireMock 3.1.0 + Fix version matching in the release pipeli…
Browse files Browse the repository at this point in the history
…nes (#86)

* Fix version in Dockerfile

* Fix version in Dockerfile-alpine

* Fix glitch in the repository patch logic in the release pipeline

* Fix escaping in the release-2.x.yml
  • Loading branch information
oleg-nenashev authored Sep 19, 2023
1 parent 4d00ce8 commit 587c13d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
# Replace version in Dockerfiles
LAST_VERSION=${LAST_VERSION%-*}
sed -i 's/ARG WIREMOCK_VERSION=.*/ARG WIREMOCK_VERSION=${ github.event.inputs.bundled-version }/g' Dockerfile alpine/Dockerfile
sed -i 's/ARG WIREMOCK_VERSION=.*/ARG WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}/g' Dockerfile alpine/Dockerfile
# Push update
git config --local user.name "wiremockbot"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
push: true
tags: ${{ join(matrix.versions.IMAGES, ',') }}
build-args: |
WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}
"WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}"
release:
runs-on: ubuntu-latest
Expand All @@ -119,7 +119,7 @@ jobs:
# Replace version in Dockerfiles
LAST_VERSION=${LAST_VERSION%-*}
sed -i 's/ARG WIREMOCK_VERSION=.*/ARG WIREMOCK_VERSION=${ github.event.inputs.bundled-version }/g' Dockerfile alpine/Dockerfile
sed -i 's/ARG WIREMOCK_VERSION=.*/ARG WIREMOCK_VERSION=${{ github.event.inputs.bundled-version }}/g' Dockerfile alpine/Dockerfile
# Push update
git config --local user.name "wiremockbot"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM eclipse-temurin:11.0.20_8-jre

LABEL maintainer="Rodolphe CHAIGNEAU <[email protected]>"

ARG WIREMOCK_VERSION=${ github.event.inputs.bundled-version }
ARG WIREMOCK_VERSION=3.1.0
ENV WIREMOCK_VERSION $WIREMOCK_VERSION
ENV GOSU_VERSION 1.14

Expand Down
2 changes: 1 addition & 1 deletion alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM eclipse-temurin:11.0.20_8-jre-alpine

LABEL maintainer="Rodolphe CHAIGNEAU <[email protected]>"

ARG WIREMOCK_VERSION=${ github.event.inputs.bundled-version }
ARG WIREMOCK_VERSION=3.1.0
ENV WIREMOCK_VERSION $WIREMOCK_VERSION

WORKDIR /home/wiremock
Expand Down

0 comments on commit 587c13d

Please sign in to comment.