Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nats] Release v2.10.11 #16260

Merged
merged 2 commits into from
Feb 16, 2024
Merged

[nats] Release v2.10.11 #16260

merged 2 commits into from
Feb 16, 2024

Conversation

bruth
Copy link
Contributor

@bruth bruth commented Feb 15, 2024

Details can be found here

Introduced the ppc64le arch as well.

Details can be found [here](https://github.com/nats-io/nats-server/releases/tag/v2.10.11)

Signed-off-by: Byron Ruth <byron@nats.io>

This comment has been minimized.

@bruth
Copy link
Contributor Author

bruth commented Feb 15, 2024

A couple changes in our nats-docker repo introduced the use of a build arg which appears to be causing the tests in this repo to fail. See here as an example. Doing a normal docker build works fine. Is there some constraint for Dockerfiles in the official images repo that prevents this from working?

@yosifkit
Copy link
Member

Is there some constraint for Dockerfiles in the official images repo that prevents this from working?

Yeah, we parse the Dockerfiles to determine build ordering and none of that supports putting variables in FROM/--from values.

Signed-off-by: Byron Ruth <byron@nats.io>
Copy link

Diff for 919f309:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index c9bc79f..07c4bc9 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -2,5 +2,6 @@ amd64
 arm32v6
 arm32v7
 arm64v8
+ppc64le
 s390x
 windows-amd64
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9dd7e16..b9bc90b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Derek Collison <derek@synadia.com> (@derekcollison), Waldemar Quevedo Salinas <wally@synadia.com> (@wallyqs), Byron Ruth <byron@synadia.com> (@bruth), Neil Twigg <neil@synadia.com> (@neilalexander), Phil Pennock <pdp@synadia.com> (@philpennock)
 GitRepo: https://github.com/nats-io/nats-docker.git
 GitFetch: refs/heads/main
-GitCommit: 8a2193806026b10571ca25b2bd7b8b775b035283
+GitCommit: c6270b7aabfd921822f677a190607d7da07976a0
 
 Tags: 2.9.24-alpine3.18, 2.9-alpine3.18, 2.9.24-alpine, 2.9-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8
@@ -24,23 +24,23 @@ Architectures: windows-amd64
 Directory: 2.9.x/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 2.10.10-alpine3.19, 2.10-alpine3.19, 2-alpine3.19, alpine3.19, 2.10.10-alpine, 2.10-alpine, 2-alpine, alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, s390x
+Tags: 2.10.11-alpine3.19, 2.10-alpine3.19, 2-alpine3.19, alpine3.19, 2.10.11-alpine, 2.10-alpine, 2-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 Directory: 2.10.x/alpine3.19
 
-Tags: 2.10.10-nanoserver-1809, 2.10-nanoserver-1809, 2-nanoserver-1809, nanoserver-1809
-SharedTags: 2.10.10-nanoserver, 2.10-nanoserver, 2-nanoserver, nanoserver, 2.10.10, 2.10, 2, latest
+Tags: 2.10.11-nanoserver-1809, 2.10-nanoserver-1809, 2-nanoserver-1809, nanoserver-1809
+SharedTags: 2.10.11-nanoserver, 2.10-nanoserver, 2-nanoserver, nanoserver, 2.10.11, 2.10, 2, latest
 Architectures: windows-amd64
 Directory: 2.10.x/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
-Tags: 2.10.10-scratch, 2.10-scratch, 2-scratch, scratch, 2.10.10-linux, 2.10-linux, 2-linux, linux
-SharedTags: 2.10.10, 2.10, 2, latest
-Architectures: amd64, arm32v6, arm32v7, arm64v8, s390x
+Tags: 2.10.11-scratch, 2.10-scratch, 2-scratch, scratch, 2.10.11-linux, 2.10-linux, 2-linux, linux
+SharedTags: 2.10.11, 2.10, 2, latest
+Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 Directory: 2.10.x/scratch
 
-Tags: 2.10.10-windowsservercore-1809, 2.10-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.10.10-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore
+Tags: 2.10.11-windowsservercore-1809, 2.10-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.10.11-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore
 Architectures: windows-amd64
 Directory: 2.10.x/windowsservercore-1809
 Constraints: windowsservercore-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index c7e9a03..f463350 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -34,15 +34,15 @@ nats:2.10-nanoserver-1809
 nats:2.10-scratch
 nats:2.10-windowsservercore
 nats:2.10-windowsservercore-1809
-nats:2.10.10
-nats:2.10.10-alpine
-nats:2.10.10-alpine3.19
-nats:2.10.10-linux
-nats:2.10.10-nanoserver
-nats:2.10.10-nanoserver-1809
-nats:2.10.10-scratch
-nats:2.10.10-windowsservercore
-nats:2.10.10-windowsservercore-1809
+nats:2.10.11
+nats:2.10.11-alpine
+nats:2.10.11-alpine3.19
+nats:2.10.11-linux
+nats:2.10.11-nanoserver
+nats:2.10.11-nanoserver-1809
+nats:2.10.11-scratch
+nats:2.10.11-windowsservercore
+nats:2.10.11-windowsservercore-1809
 nats:alpine
 nats:alpine3.19
 nats:latest
diff --git a/nats_alpine/Dockerfile b/nats_alpine/Dockerfile
index 609a429..3a5e5f2 100644
--- a/nats_alpine/Dockerfile
+++ b/nats_alpine/Dockerfile
@@ -1,16 +1,17 @@
 FROM alpine:3.19
 
-ENV NATS_SERVER 2.10.10
+ENV NATS_SERVER 2.10.11
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		aarch64) natsArch='arm64'; sha256='bbf8b7bc850580a370c9309d0e43ea2b2286e21fa9f5b33dfb751d219275e9e0' ;; \
-		armhf) natsArch='arm6'; sha256='9750cf2efb47afd8965a1ec9cd2a96c6d6af0cae70cfefc7b425e030799e1ac5' ;; \
-		armv7) natsArch='arm7'; sha256='3d9480c2bb3b0952f628d603855cbde234fe3768c498c5da89e11b8411d2be19' ;; \
-		x86_64) natsArch='amd64'; sha256='c8cd7e19b906a5f8a7f9f7e70fc4bfa492d66a069d9664c4db19fdee1b6aa640' ;; \
-		x86) natsArch='386'; sha256='99283c58577da02f6f9b0c104298308dfba18039dd48a782efc3be9d10b7bada' ;; \
-		s390x) natsArch='s390x'; sha256='e297977d1fc21c021aa989b1eda629dad9947d618558e14acc26f870ea86139a' ;; \
+		aarch64) natsArch='arm64'; sha256='52e603af6c249b716509ad7effb32033560e93578558c9e39420c15ab8d35fc5' ;; \
+		armhf) natsArch='arm6'; sha256='cf9d1668e00efba64e5f9bef36d950fcdfc99b99ec436282da2207ddbf63d35f' ;; \
+		armv7) natsArch='arm7'; sha256='582e77659441481f9a0dcd5bb3a8337137120448036db8601713b1769e19d1c2' ;; \
+		x86_64) natsArch='amd64'; sha256='4b85a83a8d3b5f919e4915fc68a43186eda37eb2f7b893c1690b3cabd1e24562' ;; \
+		x86) natsArch='386'; sha256='765acca88e27db4052b22eea63422f501e671a257da49bf955a54a52b2e314d4' ;; \
+		s390x) natsArch='s390x'; sha256='e534bcc6ee8d70090d8b60a0686970b1d6a0a79df2acdb32f367a4e9589e19ae' ;; \
+		ppc64le) natsArch='ppc64le'; sha256='f0dd6e4c8c2e1c1bfc4c058e7461bb776e62473cc35f12c8db844e2a57d4eb1b' ;; \
 		*) echo >&2 "error: $apkArch is not supported!"; exit 1 ;; \
 	esac; \
 	\
diff --git a/nats_linux/Dockerfile b/nats_linux/Dockerfile
index 8cbd55f..f3c4ca0 100644
--- a/nats_linux/Dockerfile
+++ b/nats_linux/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
 ENV PATH="$PATH:/"
 
-COPY --from=nats:2.10.10-alpine3.19 /usr/local/bin/nats-server /nats-server
+COPY --from=nats:2.10.11-alpine3.19 /usr/local/bin/nats-server /nats-server
 COPY nats-server.conf /nats-server.conf
 
 EXPOSE 4222 8222 6222
diff --git a/nats_nanoserver-1809/Dockerfile b/nats_nanoserver-1809/Dockerfile
index 7de6c58..184c1de 100644
--- a/nats_nanoserver-1809/Dockerfile
+++ b/nats_nanoserver-1809/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/windows/nanoserver:1809
 ENV NATS_DOCKERIZED 1
 
-COPY --from=nats:2.10.10-windowsservercore-1809 C:\\nats-server.exe C:\\nats-server.exe
+COPY --from=nats:2.10.11-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/nats_windowsservercore-1809/Dockerfile b/nats_windowsservercore-1809/Dockerfile
index e2a284b..05c8add 100644
--- a/nats_windowsservercore-1809/Dockerfile
+++ b/nats_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.10
+ENV NATS_SERVER 2.10.11
 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 d135040811bbf093dc9eb84df2db3c895d497133278e4db70f6f5b26b421838c
+ENV NATS_SERVER_SHASUM e788d206a4e87585cbfbe2cb63fb54ea90f60c5af2ddb3651b4abc0192ca659d
 
 RUN Set-PSDebug -Trace 2

Relevant Maintainers:

@bruth
Copy link
Contributor Author

bruth commented Feb 16, 2024

Fixed @yosifkit

@albionb96
Copy link

@tianon , @yosifkit is there any reason why this is not yet released, are there any issues with this version, or is it just ongoing?

@tianon
Copy link
Member

tianon commented Feb 16, 2024

(US-based Pacific Timezone)

@tianon tianon merged commit 8fb2b4f into docker-library:master Feb 16, 2024
9 checks passed
@wallyqs wallyqs deleted the nats_2_10_11 branch February 16, 2024 19:49
@bruth
Copy link
Contributor Author

bruth commented Feb 16, 2024

Thanks @tianon!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants