Skip to content

Commit

Permalink
Update NATS 2.10.x -> 2.10.7 (#130)
Browse files Browse the repository at this point in the history
Signed-off-by: Byron Ruth <byron@nats.io>
  • Loading branch information
bruth authored Dec 6, 2023
1 parent 2568113 commit d81b257
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions 2.10.x/alpine3.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM alpine:3.18

ENV NATS_SERVER 2.10.6
ENV NATS_SERVER 2.10.7

RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
aarch64) natsArch='arm64'; sha256='89eade997286bf889cbbd40bd52e4952d318eb85d66387162d3539124c8ec5d5' ;; \
armhf) natsArch='arm6'; sha256='2ebbdca481127ada62c5fc814ca4fea06ce18f0bdfc658769b589e1936b93566' ;; \
armv7) natsArch='arm7'; sha256='c5c0532ff6c5c32674932fa97dee462020ce5e30401d7a089ce3a5c52c259d9d' ;; \
x86_64) natsArch='amd64'; sha256='07a687d38ce737961adae346df8023ec5dc3a74e541931b911ec5e21491f6c2e' ;; \
x86) natsArch='386'; sha256='921180ca022af2316db3dc0e00689a104771a5438ecf0f6db27e92f78a17509d' ;; \
aarch64) natsArch='arm64'; sha256='9a88afab7b3805475ff7250649447d8807dd52262011252e7faedec926d01782' ;; \
armhf) natsArch='arm6'; sha256='37f8d913cdc69143edf8bd20bceced053b90dba26d1fa94e2e07b6fe17f9db2e' ;; \
armv7) natsArch='arm7'; sha256='d96042f12ecc0578d193d5353c362a572384c6ad9a46db73b7cb5f28cb6e4ad2' ;; \
x86_64) natsArch='amd64'; sha256='91f5b493ce3151baa0b15d8bf093279dc94106dd56a201704a20de567607bcf7' ;; \
x86) natsArch='386'; sha256='a5cddcac9f8debaf45e7b9ba3960778b1c786020c690991094ce31d033ec7649' ;; \
*) echo >&2 "error: $apkArch is not supported!"; exit 1 ;; \
esac; \
\
Expand Down
2 changes: 1 addition & 1 deletion 2.10.x/nanoserver-1809/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/windows/nanoserver:1809
ENV NATS_DOCKERIZED 1

COPY --from=nats:2.10.6-windowsservercore-1809 C:\\nats-server.exe C:\\nats-server.exe
COPY --from=nats:2.10.7-windowsservercore-1809 C:\\nats-server.exe C:\\nats-server.exe
COPY nats-server.conf C:\\nats-server.conf

EXPOSE 4222 8222 6222
Expand Down
2 changes: 1 addition & 1 deletion 2.10.x/scratch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM scratch
ENV PATH="$PATH:/"

COPY --from=nats:2.10.6-alpine3.18 /usr/local/bin/nats-server /nats-server
COPY --from=nats:2.10.7-alpine3.18 /usr/local/bin/nats-server /nats-server
COPY nats-server.conf /nats-server.conf

EXPOSE 4222 8222 6222
Expand Down
4 changes: 2 additions & 2 deletions 2.10.x/windowsservercore-1809/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.6
ENV NATS_SERVER 2.10.7
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 8084fc5fc16fa099fae0bb2f74dcf077ab644310918cc16e68b9909330ac798b
ENV NATS_SERVER_SHASUM 92c4883cdf608c1e096feabcc9a0f46935ba34fce72210520ba2e66207968630

RUN Set-PSDebug -Trace 2

Expand Down
4 changes: 2 additions & 2 deletions tests/build-images-2019.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Set-PSDebug -Trace 2
# Exit on error.
$ErrorActionPreference = "Stop"

$ver = 'NATS_SERVER 2.10.6'.Split(' ')[1]
$ver = 'NATS_SERVER 2.10.7'.Split(' ')[1]

Write-Output '-- host info ---'
Write-Output $PSVersionTable
Expand All @@ -27,7 +27,7 @@ if ($LASTEXITCODE -ne 0) {

cd ../..

$ver = 'NATS_SERVER 2.10.6'.Split(' ')[1]
$ver = 'NATS_SERVER 2.10.7'.Split(' ')[1]

Write-Output '-- host info ---'
Write-Output $PSVersionTable
Expand Down
4 changes: 2 additions & 2 deletions tests/build-images.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex

ver=(NATS_SERVER 2.10.6)
ver=(NATS_SERVER 2.10.7)

(
cd "2.9.x/alpine3.18"
Expand All @@ -13,7 +13,7 @@ ver=(NATS_SERVER 2.10.6)
docker build --tag nats:${ver[1]}-scratch .
)

ver=(NATS_SERVER 2.10.6)
ver=(NATS_SERVER 2.10.7)

(
cd "2.10.x/alpine3.18"
Expand Down
4 changes: 2 additions & 2 deletions tests/run-images-2019.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Set-PSDebug -Trace 2
# Exit on error.
$ErrorActionPreference = "Stop"

$ver = "NATS_SERVER 2.10.6".Split(" ")[1]
$ver = "NATS_SERVER 2.10.7".Split(" ")[1]

$images = @(
"nats:${ver}-windowsservercore-1809",
Expand All @@ -23,7 +23,7 @@ foreach ($img in $images) {
docker kill $runId
}

$ver = "NATS_SERVER 2.10.6".Split(" ")[1]
$ver = "NATS_SERVER 2.10.7".Split(" ")[1]

$images = @(
"nats:${ver}-windowsservercore-1809",
Expand Down
4 changes: 2 additions & 2 deletions tests/run-images.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex

ver=(NATS_SERVER 2.10.6)
ver=(NATS_SERVER 2.10.7)

images=(
"nats:${ver[1]}-alpine3.18"
Expand All @@ -15,7 +15,7 @@ for img in "${images[@]}"; do
docker kill "$run_id"
done

ver=(NATS_SERVER 2.10.6)
ver=(NATS_SERVER 2.10.7)

images=(
"nats:${ver[1]}-alpine3.18"
Expand Down

0 comments on commit d81b257

Please sign in to comment.