From 5292a5b9d49788856911c824a16f1213113be1cd Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Thu, 7 Apr 2016 15:36:48 +0200 Subject: [PATCH] Migrate to official docker image Signed-off-by: Emile Vauge --- README.md | 5 +++-- docs/benchmarks.md | 2 +- docs/index.md | 4 ++-- examples/compose-traefik.yml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6331ef2dc..efd0f31fd 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Build Status](https://travis-ci.org/containous/traefik.svg?branch=master)](https://travis-ci.org/containous/traefik) [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://docs.traefik.io) [![Go Report Card](https://goreportcard.com/badge/kubernetes/helm)](http://goreportcard.com/report/containous/traefik) +[![Image Layer](https://badge.imagelayers.io/traefik:latest.svg)](https://imagelayers.io/?images=traefik) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/containous/traefik/blob/master/LICENSE.md) [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com) [![Twitter](https://img.shields.io/twitter/follow/traefikproxy.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefikproxy) @@ -51,7 +52,7 @@ Run it and forget it! - Circuit breakers on backends - Round Robin, rebalancer load-balancers - Rest Metrics -- Tiny docker image included [![Image Layers](https://badge.imagelayers.io/containous/traefik:latest.svg)](https://imagelayers.io/?images=containous/traefik:latest) +- [Tiny](https://imagelayers.io/?images=traefik) [official](https://hub.docker.com/r/_/traefik/) docker image included - SSL backends support - SSL frontend support (with SNI) - Clean AngularJS Web UI @@ -92,7 +93,7 @@ You can access to a simple HTML frontend of Træfik. - Use the tiny Docker image: ```shell -docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml containous/traefik +docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik ``` - From sources: diff --git a/docs/benchmarks.md b/docs/benchmarks.md index 96c501173..c58fb26ea 100644 --- a/docs/benchmarks.md +++ b/docs/benchmarks.md @@ -52,7 +52,7 @@ Transfer/sec: 0.99MB ```sh $ docker run -d -l traefik.backend=test1 -l traefik.frontend.rule=Host -l traefik.frontend.value=test.traefik.localhost emilevauge/whoami $ docker run -d -l traefik.backend=test1 -l traefik.frontend.rule=Host -l traefik.frontend.value=test.traefik.localhost emilevauge/whoami -$ docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/traefik.toml -v /var/run/docker.sock:/var/run/docker.sock containous/traefik +$ docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/traefik.toml -v /var/run/docker.sock:/var/run/docker.sock traefik $ wrk -t12 -c400 -d60s -H "Host: test.traefik.localhost" --latency http://127.0.0.1:80 Running 1m test @ http://127.0.0.1:80 12 threads and 400 connections diff --git a/docs/index.md b/docs/index.md index 17d702344..c377cceda 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,7 +57,7 @@ You can grab the latest binary from the [releases](https://github.com/containous Using the tiny Docker image: ```shell -docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml containous/traefik +docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik ``` ## Test it @@ -66,7 +66,7 @@ You can test Træfɪk easily using [Docker compose](https://docs.docker.com/comp ```yaml traefik: - image: containous/traefik + image: traefik command: --web --docker --docker.domain=docker.localhost --logLevel=DEBUG ports: - "80:80" diff --git a/examples/compose-traefik.yml b/examples/compose-traefik.yml index 6833d7ddd..1a15e57ea 100644 --- a/examples/compose-traefik.yml +++ b/examples/compose-traefik.yml @@ -1,5 +1,5 @@ traefik: - image: containous/traefik + image: traefik command: --web --docker --docker.domain=docker.localhost --logLevel=DEBUG ports: - "80:80"