From 993165fa66c18302d2998a249659f1e88a3d6eec Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Fri, 13 May 2016 17:32:39 +0200 Subject: [PATCH] Added Devoxx Video & support (#371) Signed-off-by: Emile Vauge --- README.md | 11 +++++++++-- docs/index.md | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fa78d029a..684f164fc 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,11 @@ Run it and forget it! ## Demo -Here is a demo of Træfɪk using Docker backend, showing a load-balancing between two servers, hot reloading of configuration, and graceful shutdown. -[![asciicast](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko.png)](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko) +Here is a talk (in french) given by [Emile Vauge](https://github.com/emilevauge) at the [Devoxx France 2016](http://www.devoxx.fr) conference. +You will learn fundamental Træfɪk features and see some demos with Docker, Mesos/Marathon and Lets'Encrypt. + +[![Traefik Devoxx France](http://img.youtube.com/vi/QvAz9mVx5TI/0.jpg)](http://www.youtube.com/watch?v=QvAz9mVx5TI) ## Web UI @@ -110,6 +112,11 @@ You can find the complete documentation [here](https://docs.traefik.io). Please refer to [this section](.github/CONTRIBUTING.md). +## Support + +You can join [![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) to get basic support. +If you prefer a commercial support, please contact [containo.us](https://containo.us) by mail: . + ## Træfɪk here and there These projects use Træfɪk internally. If your company uses Træfɪk, we would be glad to get your feedback :) Contact us on [![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) diff --git a/docs/index.md b/docs/index.md index c377cceda..dbb6bba8d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -38,9 +38,10 @@ Run it and forget it! ## Demo -Here is a demo of Træfɪk using Docker backend, showing a load-balancing between two servers, hot reloading of configuration, and graceful shutdown. +Here is a talk (in french) given by [Emile Vauge](https://github.com/emilevauge) at the [Devoxx France 2016](http://www.devoxx.fr) conference. +You will learn fundamental Træfɪk features and see some demos with Docker, Mesos/Marathon and Lets'Encrypt. -[![asciicast](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko.png)](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko) +[![Traefik Devoxx France](https://img.youtube.com/vi/QvAz9mVx5TI/0.jpg)](https://www.youtube.com/watch?v=QvAz9mVx5TI) ## Get it