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

Update for Consul 1.12.0, remove 1.9.17 #12270

Merged
merged 1 commit into from
Apr 20, 2022

Conversation

markan
Copy link
Contributor

@markan markan commented Apr 20, 2022

Signed-off-by: Mark Anderson manderson@hashicorp.com

Signed-off-by: Mark Anderson <manderson@hashicorp.com>
@github-actions
Copy link

Diff for f4ce810:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f29f6ed..a8f9614 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,19 +1,19 @@
 Maintainers: Consul Team <consul@hashicorp.com> (@hashicorp/consul)
 
-Tags: 1.9.17, 1.9
+Tags: 1.10.10, 1.10
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 982eed7468b2d398c406dc466d26e762f42f020b
+GitCommit: 5b32837a6a6b94599bacb3f7c963b4697383a3e3
 Directory: 0.X
 
-Tags: 1.10.10, 1.10
+Tags: 1.11.5, 1.11
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 5b32837a6a6b94599bacb3f7c963b4697383a3e3
+GitCommit: 596911437f600b194c3da3ca7f47caaa8184123b
 Directory: 0.X
 
-Tags: 1.11.5, 1.11, latest
+Tags: 1.12.0, 1.12, latest
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 596911437f600b194c3da3ca7f47caaa8184123b
+GitCommit: 64322c2878bfa9935b742f81cf226df056f19fd6
 Directory: 0.X
diff --git a/_bashbrew-list b/_bashbrew-list
index e4afab5..53732b2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
-consul:1.9
-consul:1.9.17
 consul:1.10
 consul:1.10.10
 consul:1.11
 consul:1.11.5
+consul:1.12
+consul:1.12.0
 consul:latest
diff --git a/consul_latest/Dockerfile b/consul_1.11/Dockerfile
similarity index 100%
copy from consul_latest/Dockerfile
copy to consul_1.11/Dockerfile
diff --git a/consul_1.9/docker-entrypoint.sh b/consul_1.11/docker-entrypoint.sh
similarity index 100%
rename from consul_1.9/docker-entrypoint.sh
rename to consul_1.11/docker-entrypoint.sh
diff --git a/consul_1.9/Dockerfile b/consul_1.9/Dockerfile
deleted file mode 100644
index c7c94ab..0000000
diff --git a/consul_latest/Dockerfile b/consul_latest/Dockerfile
index d078686..026a4f2 100644
--- a/consul_latest/Dockerfile
+++ b/consul_latest/Dockerfile
@@ -8,7 +8,7 @@
 FROM alpine:3.13
 
 # This is the release of Consul to pull in.
-ARG CONSUL_VERSION=1.11.5
+ARG CONSUL_VERSION=1.12.0
 
 LABEL org.opencontainers.image.authors="Consul Team <consul@hashicorp.com>" \
       org.opencontainers.image.url="https://www.consul.io/" \

Relevant Maintainers:

  • consul: @hashicorp/consul

@yosifkit
Copy link
Member

Not a requirement to change now, but you may want to consider when to do an Alpine Linux version bump since the new 1.12.0 is still FROM alpine:3.13 which will reach "end of support" on 2022-11-01 (https://alpinelinux.org/releases/).


Just an FYI that this build will be slow since the build queue is very full from the Debian update that was merged yesterday (#12257).

@yosifkit yosifkit merged commit a51104f into docker-library:master Apr 20, 2022
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