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 Consul to 1.8.0 #8219

Merged
merged 1 commit into from
Jun 18, 2020
Merged

Conversation

crhino
Copy link
Contributor

@crhino crhino commented Jun 18, 2020

No description provided.

@github-actions
Copy link

Diff for 4d9bce0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index ce8084b..c81e0fc 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,14 +6,14 @@ GitRepo: https://github.com/hashicorp/docker-consul.git
 GitCommit: 2fe858e74a4acb93a51934fbafb5dfa8dc6d7000
 Directory: 0.X
 
-Tags: 1.7.4, 1.7, latest
+Tags: 1.7.4, 1.7
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
 GitCommit: 07079c05e2a3adccec1ff665dcf8869ffbb0e1be
 Directory: 0.X
 
-Tags: 1.8.0-rc1, 1.8.0-beta
+Tags: 1.8.0, 1.8, latest
 Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
-GitCommit: 267a7b200b52f0315b8c59546236c2af7b39c8f1
+GitCommit: f15bee814fdec35c2b101b54a1afceaed4496973
 Directory: 0.X
diff --git a/_bashbrew-list b/_bashbrew-list
index ad2f4e4..6124d03 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,6 +2,6 @@ consul:1.6
 consul:1.6.6
 consul:1.7
 consul:1.7.4
-consul:1.8.0-beta
-consul:1.8.0-rc1
+consul:1.8
+consul:1.8.0
 consul:latest
diff --git a/consul_latest/Dockerfile b/consul_1.7/Dockerfile
similarity index 100%
copy from consul_latest/Dockerfile
copy to consul_1.7/Dockerfile
diff --git a/consul_1.8.0-beta/docker-entrypoint.sh b/consul_1.7/docker-entrypoint.sh
similarity index 100%
rename from consul_1.8.0-beta/docker-entrypoint.sh
rename to consul_1.7/docker-entrypoint.sh
diff --git a/consul_1.8.0-beta/Dockerfile b/consul_1.8.0-beta/Dockerfile
deleted file mode 100644
index e942772..0000000
diff --git a/consul_latest/Dockerfile b/consul_latest/Dockerfile
index 6eff69f..9f407f9 100644
--- a/consul_latest/Dockerfile
+++ b/consul_latest/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.9
 MAINTAINER Consul Team <consul@hashicorp.com>
 
 # This is the release of Consul to pull in.
-ENV CONSUL_VERSION=1.7.4
+ENV CONSUL_VERSION=1.8.0
 
 # This is the location of the releases.
 ENV HASHICORP_RELEASES=https://releases.hashicorp.com

@tianon tianon merged commit 5a8de9a into docker-library:master Jun 18, 2020
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