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

consul: add 1.10.0-beta2 #10132

Merged
merged 2 commits into from
May 7, 2021
Merged

consul: add 1.10.0-beta2 #10132

merged 2 commits into from
May 7, 2021

Conversation

mikemorris
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

yosifkit commented May 6, 2021

😕 The older (unchanged) versions are failing to build with Can't check signature: No public key; did their signature files get updated and they also need the new key that the 1.10-beta2 image now has?

@mikemorris
Copy link
Contributor Author

Yep, that's exactly it @yosifkit - sorry for not catching that before opening the PR, just pushed a commit that should fix those now.

@github-actions
Copy link

github-actions bot commented May 7, 2021

Diff for 935143e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 618db94..22dec3a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,23 +3,23 @@ Maintainers: Consul Team <consul@hashicorp.com> (@hashicorp/consul)
 Tags: 1.7.14, 1.7
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 82ecb6b76d35371a787c3b15f3fc159ab3ed1009
+GitCommit: 43b15caac2a3d8f61c9ef57fab8e9eee1a07ca60
 Directory: 0.X
 
 Tags: 1.8.10, 1.8
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 69a324deb789e8cb68883e5d0d56ed97770a2538
+GitCommit: 12580e22affec44a4ce60590ccfaf0974d7d5c7b
 Directory: 0.X
 
 Tags: 1.9.5, 1.9, latest
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: d1e6c69aa3cc520d93bc7b7e2260f5e857e704d4
+GitCommit: c77d4c566243f4c75a3efb226b074b3e2063a3f3
 Directory: 0.X
 
-Tags: 1.10.0-beta1, 1.10.0-beta
+Tags: 1.10.0-beta2, 1.10.0-beta
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 90e04347b5b4fd6d903dc1ad2412c0517ee9755b
+GitCommit: 1f909f5d28ddac5be608d1281502de94a2a7132f
 Directory: 0.X
diff --git a/_bashbrew-list b/_bashbrew-list
index 0deda57..caffa24 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,5 +5,5 @@ consul:1.8.10
 consul:1.9
 consul:1.9.5
 consul:1.10.0-beta
-consul:1.10.0-beta1
+consul:1.10.0-beta2
 consul:latest
diff --git a/consul_1.10.0-beta/Dockerfile b/consul_1.10.0-beta/Dockerfile
index f56a9c5..d1f2c6e 100644
--- a/consul_1.10.0-beta/Dockerfile
+++ b/consul_1.10.0-beta/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.12
 LABEL org.opencontainers.image.authors="Consul Team <consul@hashicorp.com>"
 
 # This is the release of Consul to pull in.
-ARG CONSUL_VERSION=1.10.0-beta1
+ARG CONSUL_VERSION=1.10.0-beta2
 LABEL org.opencontainers.image.version=$CONSUL_VERSION
 
 # This is the location of the releases.
@@ -17,7 +17,7 @@ RUN addgroup consul && \
 # libc6-compat is needed to symlink the shared libraries for ARM builds
 RUN set -eux && \
     apk add --no-cache ca-certificates curl dumb-init gnupg libcap openssl su-exec iputils jq libc6-compat iptables && \
-    gpg --keyserver pool.sks-keyservers.net --recv-keys 91A6E7F85D05C65630BEF18951852D87348FFC4C && \
+    gpg --keyserver pool.sks-keyservers.net --recv-keys C874011F0AB405110D02105534365D9472D7468F && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     apkArch="$(apk --print-arch)" && \
diff --git a/consul_1.7/Dockerfile b/consul_1.7/Dockerfile
index 0bb0b1e..c18471d 100644
--- a/consul_1.7/Dockerfile
+++ b/consul_1.7/Dockerfile
@@ -17,7 +17,7 @@ RUN addgroup consul && \
 # libc6-compat is needed to symlink the shared libraries for ARM builds
 RUN set -eux && \
     apk add --no-cache ca-certificates curl dumb-init gnupg libcap openssl su-exec iputils jq libc6-compat iptables && \
-    gpg --keyserver pool.sks-keyservers.net --recv-keys 91A6E7F85D05C65630BEF18951852D87348FFC4C && \
+    gpg --keyserver pool.sks-keyservers.net --recv-keys C874011F0AB405110D02105534365D9472D7468F && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     apkArch="$(apk --print-arch)" && \
diff --git a/consul_1.8/Dockerfile b/consul_1.8/Dockerfile
index fe324a8..51274ae 100644
--- a/consul_1.8/Dockerfile
+++ b/consul_1.8/Dockerfile
@@ -17,7 +17,7 @@ RUN addgroup consul && \
 # libc6-compat is needed to symlink the shared libraries for ARM builds
 RUN set -eux && \
     apk add --no-cache ca-certificates curl dumb-init gnupg libcap openssl su-exec iputils jq libc6-compat iptables && \
-    gpg --keyserver pool.sks-keyservers.net --recv-keys 91A6E7F85D05C65630BEF18951852D87348FFC4C && \
+    gpg --keyserver pool.sks-keyservers.net --recv-keys C874011F0AB405110D02105534365D9472D7468F && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     apkArch="$(apk --print-arch)" && \
diff --git a/consul_latest/Dockerfile b/consul_latest/Dockerfile
index dcc3ab6..36227f8 100644
--- a/consul_latest/Dockerfile
+++ b/consul_latest/Dockerfile
@@ -17,7 +17,7 @@ RUN addgroup consul && \
 # libc6-compat is needed to symlink the shared libraries for ARM builds
 RUN set -eux && \
     apk add --no-cache ca-certificates curl dumb-init gnupg libcap openssl su-exec iputils jq libc6-compat iptables && \
-    gpg --keyserver pool.sks-keyservers.net --recv-keys 91A6E7F85D05C65630BEF18951852D87348FFC4C && \
+    gpg --keyserver pool.sks-keyservers.net --recv-keys C874011F0AB405110D02105534365D9472D7468F && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     apkArch="$(apk --print-arch)" && \

@yosifkit yosifkit merged commit 8a957cf into docker-library:master May 7, 2021
@mikemorris mikemorris deleted the patch-5 branch May 7, 2021 19:59
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.

2 participants