From dde13357c04762cbaa74e092a86de36075a2ef2e Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Wed, 17 Jul 2024 08:21:13 -0400 Subject: [PATCH] Release v2.10.18 (#174) Signed-off-by: Byron Ruth --- 2.10.x/alpine3.20/Dockerfile | 16 ++++++++-------- 2.10.x/nanoserver-1809/Dockerfile | 2 +- 2.10.x/nanoserver-1809/Dockerfile.preview | 2 +- 2.10.x/scratch/Dockerfile | 2 +- 2.10.x/scratch/Dockerfile.preview | 2 +- 2.10.x/tests/build-images-2019.ps1 | 2 +- 2.10.x/tests/build-images.sh | 2 +- 2.10.x/tests/run-images-2019.ps1 | 2 +- 2.10.x/tests/run-images.sh | 2 +- 2.10.x/windowsservercore-1809/Dockerfile | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/2.10.x/alpine3.20/Dockerfile b/2.10.x/alpine3.20/Dockerfile index e66f173..078ee3f 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.18-RC.4 +ENV NATS_SERVER 2.10.18 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - aarch64) natsArch='arm64'; sha256='8d489d8a902c90dd2633b73122a3f43a782b474db5f448a4e92223b60fd68eb8' ;; \ - armhf) natsArch='arm6'; sha256='271df2b5d09f32119ab7399f693db0065413c08a62c714fafa7519e4a90d72c4' ;; \ - armv7) natsArch='arm7'; sha256='37a21ea95ff949835e223f01b47696932748011e5023cfe9adcea0bd68e7e0ee' ;; \ - x86_64) natsArch='amd64'; sha256='e640a9b89a3ee36ac12c5dd6f821c101aa6ce5b2745a76839c9f338b143f8ca4' ;; \ - x86) natsArch='386'; sha256='fa5e327457dec5080d60017ec185d218123e5b652f496c40f2600caa96c135f8' ;; \ - s390x) natsArch='s390x'; sha256='7261217ffb43f01fffdc24e3ce8fc23425993edfa739da723e419f6097898b94' ;; \ - ppc64le) natsArch='ppc64le'; sha256='4dbd4d3a5c701fa8b1f60e8dfaf55755206abed7d42bffacf6a73ebdbe470bc6' ;; \ + aarch64) natsArch='arm64'; sha256='3f026443e902a21e787382ca10e1446bf02a8bb779224b1b7b33ea6483f76b02' ;; \ + armhf) natsArch='arm6'; sha256='69bc51de3e7c4f2585c68a51372f0b0e4fbc4048d9251606480dd0f416f28f87' ;; \ + armv7) natsArch='arm7'; sha256='80b7ba618d76f22b79bc192a4867c799e9c02fae10f8938d4514a3954f791174' ;; \ + x86_64) natsArch='amd64'; sha256='7760fe7347ba8e8daf4474811cf7fc301713aa8f3d4e0787d3e79a496dd537b2' ;; \ + x86) natsArch='386'; sha256='2e7cb64dd7f0de0256d74a2ea3792c63c3af28cddc66ce7101f1156e40941c56' ;; \ + s390x) natsArch='s390x'; sha256='c9534f9d4c6783780e71e61037890fcb4dda3917c875e904209aef3b7b5e74b0' ;; \ + ppc64le) natsArch='ppc64le'; sha256='f6020a31d6fc3923b1782eb22f6f16e27f4e0c0a004ce8d014d7298c9a3a3082' ;; \ *) 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 c3875e3..c6d940d 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.18-RC.4-windowsservercore-1809 C:\\nats-server.exe C:\\nats-server.exe +COPY --from=nats:2.10.18-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 0e47232..c704b5d 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.18-RC.4-windowsservercore-1809 +ARG BASE_IMAGE=nats:2.10.18-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 1915dfa..9b931e6 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.18-RC.4-alpine3.20 /usr/local/bin/nats-server /nats-server +COPY --from=nats:2.10.18-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 5323185..a9f82d2 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.18-RC.4-alpine3.20 +ARG BASE_IMAGE=nats:2.10.18-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 6f8505e..bb1a8ad 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.18-RC.4'.Split(' ')[1] +$ver = 'NATS_SERVER 2.10.18'.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 b8c6b25..63e4b82 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.18-RC.4) +ver=(NATS_SERVER 2.10.18) ( cd "../alpine3.20" diff --git a/2.10.x/tests/run-images-2019.ps1 b/2.10.x/tests/run-images-2019.ps1 index 152f3b2..17a950c 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.18-RC.4".Split(" ")[1] +$ver = "NATS_SERVER 2.10.18".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 d335c4e..3f09a02 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.18-RC.4) +ver=(NATS_SERVER 2.10.18) images=( "nats:${ver[1]}-alpine3.20" diff --git a/2.10.x/windowsservercore-1809/Dockerfile b/2.10.x/windowsservercore-1809/Dockerfile index 813d1e3..d26244f 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.18-RC.4 +ENV NATS_SERVER 2.10.18 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 4d483509b714ddd62dff1fd8d27ba8eb321118f70e4bef6202ca09430a6471c6 +ENV NATS_SERVER_SHASUM 191a6cb6f7391005b5f886ae4fb700907dd977149f650febda9ae433701bf547 RUN Set-PSDebug -Trace 2