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: 1.9.0-beta1 #8886

Merged
merged 1 commit into from
Oct 12, 2020
Merged

Conversation

mikemorris
Copy link
Contributor

No description provided.

@github-actions
Copy link

Diff for cafa7d5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 333c7af..75e5420 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -17,3 +17,9 @@ Architectures: amd64, arm32v6, arm64v8, i386
 GitRepo: https://github.com/hashicorp/docker-consul.git
 GitCommit: 960119e28e51882c4c4e175e84684ad4370ae1c5
 Directory: 0.X
+
+Tags: 1.9.0-beta1, 1.9.0-beta
+Architectures: amd64, arm32v6, arm64v8, i386
+GitRepo: https://github.com/hashicorp/docker-consul.git
+GitCommit: 1ecd1de6abdaaf15d39fb8f42f88c3f440472d7a
+Directory: 0.X
diff --git a/_bashbrew-list b/_bashbrew-list
index ac8ab25..3d8aed4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,4 +4,6 @@ consul:1.7
 consul:1.7.8
 consul:1.8
 consul:1.8.4
+consul:1.9.0-beta
+consul:1.9.0-beta1
 consul:latest
diff --git a/consul_latest/Dockerfile b/consul_1.9.0-beta/Dockerfile
similarity index 99%
copy from consul_latest/Dockerfile
copy to consul_1.9.0-beta/Dockerfile
index e2f5ae3..9e89315 100644
--- a/consul_latest/Dockerfile
+++ b/consul_1.9.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.
-ENV CONSUL_VERSION=1.8.4
+ENV CONSUL_VERSION=1.9.0-beta1
 
 # This is the location of the releases.
 ENV HASHICORP_RELEASES=https://releases.hashicorp.com
diff --git a/consul_1.6/docker-entrypoint.sh b/consul_1.9.0-beta/docker-entrypoint.sh
similarity index 100%
copy from consul_1.6/docker-entrypoint.sh
copy to consul_1.9.0-beta/docker-entrypoint.sh

@tianon
Copy link
Member

tianon commented Oct 12, 2020

LGTM (although unfortunately, thanks to actions/runner#751, we didn't get Actions 😞)


Build test of #8886; cafa7d5; amd64 (consul):

$ bashbrew build consul:1.9.0-beta1
Building bashbrew/cache:0ffcb27a6329cdb8352549dacaec86c201749d3ccb4d10e1e93f06419b6ffc51 (consul:1.9.0-beta1)
Tagging consul:1.9.0-beta1
Tagging consul:1.9.0-beta

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


$ bashbrew build consul:1.8.4
Building bashbrew/cache:471f24f74b9af8ee61eaf3f2676be2afa8e504e9849c163470b09e38fece0caa (consul:1.8.4)
Tagging consul:1.8.4
Tagging consul:1.8
Tagging consul:latest

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


$ bashbrew build consul:1.7.8
Building bashbrew/cache:be1b3ab9a9a957db8a8d6270f70d440d350543c85ba856eab2dc774b399fac43 (consul:1.7.8)
Tagging consul:1.7.8
Tagging consul:1.7

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


$ bashbrew build consul:1.6.9
Building bashbrew/cache:3a28a936c558af04f85962056f26cc89175257344b253005e3e0419415151bb2 (consul:1.6.9)
Tagging consul:1.6.9
Tagging consul:1.6

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

@tianon tianon merged commit 9cdc980 into docker-library:master Oct 12, 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