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

Bump traefik to v1.2.0-rc1 #2624

Merged
merged 1 commit into from
Feb 6, 2017
Merged

Conversation

emilevauge
Copy link
Contributor

Hello,

This PR updates traefik to v1.2.0-rc1.
/cc @vdemeester

Cheers

Copy link
Contributor

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👼 🐹

@yosifkit
Copy link
Member

yosifkit commented Feb 6, 2017

diff --git a/traefik_camembert-alpine/Dockerfile b/traefik_morbier-alpine/Dockerfile
similarity index 82%
copy from traefik_camembert-alpine/Dockerfile
copy to traefik_morbier-alpine/Dockerfile
index 56cd3a4..15522bf 100644
--- a/traefik_camembert-alpine/Dockerfile
+++ b/traefik_morbier-alpine/Dockerfile
@@ -13,5 +13,5 @@ LABEL org.label-schema.vendor="Containous" \
       org.label-schema.url="https://traefik.io" \
       org.label-schema.name="Traefik" \
       org.label-schema.description="A modern reverse-proxy" \    
-      org.label-schema.version="v1.1.2" \
+      org.label-schema.version="v1.2.0-rc1" \
       org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
diff --git a/traefik_camembert-alpine/Dockerfile.tmpl b/traefik_morbier-alpine/Dockerfile.tmpl
similarity index 100%
copy from traefik_camembert-alpine/Dockerfile.tmpl
copy to traefik_morbier-alpine/Dockerfile.tmpl
diff --git a/traefik_camembert-alpine/entrypoint.sh b/traefik_morbier-alpine/entrypoint.sh
similarity index 100%
copy from traefik_camembert-alpine/entrypoint.sh
copy to traefik_morbier-alpine/entrypoint.sh
diff --git a/traefik_reblochon/traefik b/traefik_morbier-alpine/traefik
similarity index 43%
copy from traefik_reblochon/traefik
copy to traefik_morbier-alpine/traefik
index 3263eb7..80151f0 100755
Binary files a/traefik_reblochon/traefik and b/traefik_morbier-alpine/traefik differ
diff --git a/traefik_latest/Dockerfile b/traefik_morbier/Dockerfile
similarity index 77%
copy from traefik_latest/Dockerfile
copy to traefik_morbier/Dockerfile
index 79a0227..f6323a2 100644
--- a/traefik_latest/Dockerfile
+++ b/traefik_morbier/Dockerfile
@@ -9,5 +9,5 @@ LABEL org.label-schema.vendor="Containous" \
       org.label-schema.url="https://traefik.io" \
       org.label-schema.name="Traefik" \
       org.label-schema.description="A modern reverse-proxy" \    
-      org.label-schema.version="v1.1.2" \
+      org.label-schema.version="v1.2.0-rc1" \
       org.label-schema.docker.schema-version="1.0"
\ No newline at end of file
diff --git a/traefik_latest/Dockerfile.tmpl b/traefik_morbier/Dockerfile.tmpl
similarity index 100%
copy from traefik_latest/Dockerfile.tmpl
copy to traefik_morbier/Dockerfile.tmpl
diff --git a/traefik_latest/certs/ca-certificates.crt b/traefik_morbier/certs/ca-certificates.crt
similarity index 100%
copy from traefik_latest/certs/ca-certificates.crt
copy to traefik_morbier/certs/ca-certificates.crt
diff --git a/traefik_reblochon/traefik b/traefik_morbier/traefik
similarity index 43%
rename from traefik_reblochon/traefik
rename to traefik_morbier/traefik
index 3263eb7..80151f0 100755
Binary files a/traefik_reblochon/traefik and b/traefik_morbier/traefik differ
diff --git a/traefik_reblochon/Dockerfile b/traefik_reblochon/Dockerfile
deleted file mode 100644
index 335427d..0000000
diff --git a/traefik_reblochon/Dockerfile.alpine b/traefik_reblochon/Dockerfile.alpine
deleted file mode 100644
index 3237b65..0000000
diff --git a/traefik_reblochon/certs/ca-certificates.crt b/traefik_reblochon/certs/ca-certificates.crt
deleted file mode 100644
index fe565a7..0000000

Build test of #2624; 8735da1 (traefik):

$ bashbrew build traefik:v1.2.0-rc1
Building bashbrew/cache:4744a180ca920ecaa2dfde95063a47ce6afa5764321410c8b0882c2972102b59 (traefik:v1.2.0-rc1)
Tagging traefik:v1.2.0-rc1
Tagging traefik:1.2.0-rc1
Tagging traefik:morbier

$ test/run.sh traefik:v1.2.0-rc1
testing traefik:v1.2.0-rc1
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed


$ bashbrew build traefik:v1.2.0-rc1-alpine
Building bashbrew/cache:f71ba9594540efbe2cb8cc753f3d7c5d844710f3e4450d7e613c5c14b72629ed (traefik:v1.2.0-rc1-alpine)
Tagging traefik:v1.2.0-rc1-alpine
Tagging traefik:1.2.0-rc1-alpine
Tagging traefik:morbier-alpine

$ test/run.sh traefik:v1.2.0-rc1-alpine
testing traefik:v1.2.0-rc1-alpine
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...passed


$ bashbrew build traefik:v1.1.2
Using bashbrew/cache:8f13e7a5a0f7f7cbbdb6db73a3fa1f1912ea85dd7f881df215a85148fc7a3c63 (traefik:v1.1.2)
Tagging traefik:v1.1.2
Tagging traefik:1.1.2
Tagging traefik:camembert
Tagging traefik:latest

$ test/run.sh traefik:v1.1.2
testing traefik:v1.1.2
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...image does not appear to contain "echo" -- assuming single-binary image
passed


$ bashbrew build traefik:v1.1.2-alpine
Using bashbrew/cache:a812540e2f4de03ee2fef86cf7c6f7cd5b89ad9c41cf66ff9293ce93a162da11 (traefik:v1.1.2-alpine)
Tagging traefik:v1.1.2-alpine
Tagging traefik:1.1.2-alpine
Tagging traefik:camembert-alpine

$ test/run.sh traefik:v1.1.2-alpine
testing traefik:v1.1.2-alpine
	'cve-2014--shellshock' [1/2]...passed
	'override-cmd' [2/2]...passed

@yosifkit yosifkit merged commit 56e8631 into docker-library:master Feb 6, 2017
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.

4 participants