diff --git a/2.10.x/alpine3.20/Dockerfile b/2.10.x/alpine3.20/Dockerfile index fc3bc78..6de926c 100644 --- a/2.10.x/alpine3.20/Dockerfile +++ b/2.10.x/alpine3.20/Dockerfile @@ -1,17 +1,17 @@ FROM alpine:3.20 -ENV NATS_SERVER 2.10.19-RC.6 +ENV NATS_SERVER 2.10.19 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - aarch64) natsArch='arm64'; sha256='fbdc7f5aad6d2cd9304ba72d0ed6c021ca1b0f0ad5cef069a465036692cd40dd' ;; \ - armhf) natsArch='arm6'; sha256='55f32bf8194b9f91f453c11ce74fb2a7188fa42683babe93f7fa8db98b2013c9' ;; \ - armv7) natsArch='arm7'; sha256='46cb669883069df7e0774b34ca92334b25c716ab52e72a8ecdd33461447cf660' ;; \ - x86_64) natsArch='amd64'; sha256='d2ed4b459c2d5016bc543692b71279d0950be1fe7b57338101470c265e895c4d' ;; \ - x86) natsArch='386'; sha256='2defd3c54ede747c8a70713a0cde1168a6f27525d2de0ed7b8035bd5d797e27c' ;; \ - s390x) natsArch='s390x'; sha256='dd304afe7b70765847841a4b77461d19e0099531028bcc7a2deaa87aa15d4d47' ;; \ - ppc64le) natsArch='ppc64le'; sha256='a1a769461ce3e06f65f7f0a83bc00538601d71adc44c4127a0f26d56f7c091b0' ;; \ + aarch64) natsArch='arm64'; sha256='41e8d3fb78e255f1303d856e590a96a174edee02277edc72d58f882958f6449f' ;; \ + armhf) natsArch='arm6'; sha256='3c2fbdda83c9ff25e90abcca5b8c156b2c29fc9a8cab198626a80e9843ea5bdd' ;; \ + armv7) natsArch='arm7'; sha256='271b055c2bdb86dcc0de49001dce320f1fbf76949b5f3a8d730985d864144f88' ;; \ + x86_64) natsArch='amd64'; sha256='e64e6628795d26fc9c9b15b3894757cde3cefb85cb4a12c23001c997abd276dc' ;; \ + x86) natsArch='386'; sha256='bcf3d343e8877139c8af0713c380d073f6c0a773def1db75c81a8fdbe96a4e92' ;; \ + s390x) natsArch='s390x'; sha256='e7317aa5ea10047f6eb20e2dd6b5a305156b42928663a865be5f6f35bac56880' ;; \ + ppc64le) natsArch='ppc64le'; sha256='effd70f1322344c6a5261c5ccf6ccc6b67b77a6da23133d498628ed530ee8a62' ;; \ *) echo >&2 "error: $apkArch is not supported!"; exit 1 ;; \ esac; \ \ diff --git a/2.10.x/nanoserver-1809/Dockerfile b/2.10.x/nanoserver-1809/Dockerfile index 92ea703..b77dc38 100644 --- a/2.10.x/nanoserver-1809/Dockerfile +++ b/2.10.x/nanoserver-1809/Dockerfile @@ -1,7 +1,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 ENV NATS_DOCKERIZED 1 -COPY --from=nats:2.10.19-RC.6-windowsservercore-1809 C:\\nats-server.exe C:\\nats-server.exe +COPY --from=nats:2.10.19-windowsservercore-1809 C:\\nats-server.exe C:\\nats-server.exe COPY nats-server.conf C:\\nats-server.conf EXPOSE 4222 8222 6222 diff --git a/2.10.x/nanoserver-1809/Dockerfile.preview b/2.10.x/nanoserver-1809/Dockerfile.preview index f69559b..f381122 100644 --- a/2.10.x/nanoserver-1809/Dockerfile.preview +++ b/2.10.x/nanoserver-1809/Dockerfile.preview @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=nats:2.10.19-RC.6-windowsservercore-1809 +ARG BASE_IMAGE=nats:2.10.19-windowsservercore-1809 FROM $BASE_IMAGE AS base FROM mcr.microsoft.com/windows/nanoserver:1809 diff --git a/2.10.x/scratch/Dockerfile b/2.10.x/scratch/Dockerfile index 91a359d..b338fe4 100644 --- a/2.10.x/scratch/Dockerfile +++ b/2.10.x/scratch/Dockerfile @@ -1,7 +1,7 @@ FROM scratch ENV PATH="$PATH:/" -COPY --from=nats:2.10.19-RC.6-alpine3.20 /usr/local/bin/nats-server /nats-server +COPY --from=nats:2.10.19-alpine3.20 /usr/local/bin/nats-server /nats-server COPY nats-server.conf /nats-server.conf EXPOSE 4222 8222 6222 diff --git a/2.10.x/scratch/Dockerfile.preview b/2.10.x/scratch/Dockerfile.preview index 37c5600..37ed128 100644 --- a/2.10.x/scratch/Dockerfile.preview +++ b/2.10.x/scratch/Dockerfile.preview @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=nats:2.10.19-RC.6-alpine3.20 +ARG BASE_IMAGE=nats:2.10.19-alpine3.20 FROM $BASE_IMAGE AS base FROM scratch diff --git a/2.10.x/tests/build-images-2019.ps1 b/2.10.x/tests/build-images-2019.ps1 index de6a8e1..4719d03 100644 --- a/2.10.x/tests/build-images-2019.ps1 +++ b/2.10.x/tests/build-images-2019.ps1 @@ -3,7 +3,7 @@ Set-PSDebug -Trace 2 # Exit on error. $ErrorActionPreference = "Stop" -$ver = 'NATS_SERVER 2.10.19-RC.6'.Split(' ')[1] +$ver = 'NATS_SERVER 2.10.19'.Split(' ')[1] Write-Output '-- host info ---' Write-Output $PSVersionTable diff --git a/2.10.x/tests/build-images.sh b/2.10.x/tests/build-images.sh index 6d47f97..0b1f883 100755 --- a/2.10.x/tests/build-images.sh +++ b/2.10.x/tests/build-images.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -ex -ver=(NATS_SERVER 2.10.19-RC.6) +ver=(NATS_SERVER 2.10.19) ( cd "../alpine3.20" diff --git a/2.10.x/tests/run-images-2019.ps1 b/2.10.x/tests/run-images-2019.ps1 index e20a4c9..ef8ccdd 100644 --- a/2.10.x/tests/run-images-2019.ps1 +++ b/2.10.x/tests/run-images-2019.ps1 @@ -3,7 +3,7 @@ Set-PSDebug -Trace 2 # Exit on error. $ErrorActionPreference = "Stop" -$ver = "NATS_SERVER 2.10.19-RC.6".Split(" ")[1] +$ver = "NATS_SERVER 2.10.19".Split(" ")[1] $images = @( "nats:${ver}-windowsservercore-1809", diff --git a/2.10.x/tests/run-images.sh b/2.10.x/tests/run-images.sh index 3862f0d..f39c298 100755 --- a/2.10.x/tests/run-images.sh +++ b/2.10.x/tests/run-images.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -ex -ver=(NATS_SERVER 2.10.19-RC.6) +ver=(NATS_SERVER 2.10.19) images=( "nats:${ver[1]}-alpine3.20" diff --git a/2.10.x/windowsservercore-1809/Dockerfile b/2.10.x/windowsservercore-1809/Dockerfile index 7bb320e..181bdc4 100644 --- a/2.10.x/windowsservercore-1809/Dockerfile +++ b/2.10.x/windowsservercore-1809/Dockerfile @@ -4,9 +4,9 @@ FROM mcr.microsoft.com/windows/servercore:1809 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"] ENV NATS_DOCKERIZED 1 -ENV NATS_SERVER 2.10.19-RC.6 +ENV NATS_SERVER 2.10.19 ENV NATS_SERVER_DOWNLOAD https://github.com/nats-io/nats-server/releases/download/v${NATS_SERVER}/nats-server-v${NATS_SERVER}-windows-amd64.zip -ENV NATS_SERVER_SHASUM e479760f55cdcc19f6ea141b803f72d740b937bf8b5e27f2a72bed2c50cc3b33 +ENV NATS_SERVER_SHASUM 1d7b4409cf70c302c09702732078d684be9a1d8ec797e57e77344f79086feaf8 RUN Set-PSDebug -Trace 2