-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
consul: add 1.10.0-beta2 #10132
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
😕 The older (unchanged) versions are failing to build with |
to update gpg keys
Yep, that's exactly it @yosifkit - sorry for not catching that before opening the PR, just pushed a commit that should fix those now. |
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)" && \
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.