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

Bumps to Consul 1.0.0. #3587

Merged
merged 1 commit into from Oct 16, 2017

Conversation

Projects
None yet
4 participants
@slackpad
Copy link
Contributor

commented Oct 16, 2017

No description provided.

@yosifkit

This comment has been minimized.

Copy link
Member

commented Oct 16, 2017

Diff:
warning: insecure protocol git:// detected: git://github.com/hashicorp/docker-consul
diff --git a/_bashbrew-arches b/_bashbrew-arches
index cdac1a3..ac82614 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1 +1 @@
-consul:0.9.3 @ amd64
+consul:1.0.0 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 7913e34..7b7aadd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,2 +1,2 @@
-consul:0.9.3
+consul:1.0.0
 consul:latest
diff --git a/consul_0.9.3/Dockerfile b/consul_1.0.0/Dockerfile
similarity index 99%
rename from consul_0.9.3/Dockerfile
rename to consul_1.0.0/Dockerfile
index 487e6ba..1e96f1a 100644
--- a/consul_0.9.3/Dockerfile
+++ b/consul_1.0.0/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.6
 MAINTAINER James Phillips <james@hashicorp.com> (@slackpad)
 
 # This is the release of Consul to pull in.
-ENV CONSUL_VERSION=0.9.3
+ENV CONSUL_VERSION=1.0.0
 
 # This is the release of https://github.com/hashicorp/docker-base to pull in order
 # to provide HashiCorp-built versions of basic utilities like dumb-init and gosu.
diff --git a/consul_0.9.3/docker-entrypoint.sh b/consul_1.0.0/docker-entrypoint.sh
similarity index 100%
rename from consul_0.9.3/docker-entrypoint.sh
rename to consul_1.0.0/docker-entrypoint.sh
@yosifkit

This comment has been minimized.

Copy link
Member

commented Oct 16, 2017

Build test of #3587; c7a7158 (consul):

$ bashbrew build consul:latest
Using bashbrew/cache:c74b3e8bf3ea2f630f1a60aa4f2415cfd30ea8a4375a7bf1d144f4bc04826578 (consul:latest)
Tagging consul:latest
Tagging consul:1.0.0

$ test/run.sh consul:latest
testing consul:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit aa3cd92 into docker-library:master Oct 16, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@slackpad

This comment has been minimized.

Copy link
Contributor Author

commented Oct 16, 2017

Hi @yosifkit it looks like folks trying to pull the 1.0.0 tag are getting the 0.9.3 release somehow - hashicorp/docker-consul#68.

@tianon

This comment has been minimized.

Copy link
Member

commented Oct 16, 2017

I'm not at a computer right now to verify, but that's probably similar to #3467; we should swap the order of these lines so latest is last instead of first. The current issue should resolve itself shortly (once the amd64 builder kicks off and then the put-shared job).

@slackpad

This comment has been minimized.

Copy link
Contributor Author

commented Oct 16, 2017

Thanks @tianon I'll tee that up in another PR.

slackpad added a commit to hashicorp/docker-official-images that referenced this pull request Oct 16, 2017

@slackpad

This comment has been minimized.

Copy link
Contributor Author

commented Oct 16, 2017

#3591 has the swap!

@tianon

This comment has been minimized.

Copy link
Member

commented Dec 21, 2017

I've filed #3835 in order to have a central place to track this problem globally more directly. 👍 ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.