Commit graph

724 commits

Author SHA1 Message Date
Emile Vauge
c03e2d4f44 Merge branch 'master' into emilevauge-ghr-corrections 2015-10-08 19:24:38 +02:00
emile
0574cbd8bc Corrects release management with build number in tags 2015-10-08 19:16:08 +02:00
Vincent Demeester
af674dffdb Merge pull request #45 from EmileVauge/emilevauge-marathon-bugs
Corrects https://github.com/EmileVauge/traefik/issues/37
2015-10-08 19:08:51 +02:00
emile
4c50648480 Corrects https://github.com/EmileVauge/traefik/issues/37 2015-10-08 09:31:30 +02:00
Emile Vauge
f927c7dd0b Merge pull request #42 from ldez/feature/web-ui-documentation
docs(webui): add documentation
2015-10-07 14:41:57 +02:00
Fernandez Ludovic
5c901e4522 docs(webui): add documentation 2015-10-07 14:09:11 +02:00
Vincent Demeester
3d3581b2b6 Merge pull request #39 from ldez/feature/provider-tab
feat(dashboard): add provider's tabs
2015-10-07 11:36:25 +02:00
Fernandez Ludovic
64d635f776 feat(dashboard): add provider's tabs
- slit provider between tabs
- remove providerID from backend/frontend title
- add Angular-Boostrap
2015-10-07 00:01:24 +02:00
Emile Vauge
f4296dfef0 Merge pull request #38 from ldez/feature/dashboard-font-correction
refactor(dashboard): font definition correction
2015-10-06 21:57:40 +02:00
Fernandez Ludovic
713c2e09a8 refactor(dashboard): font definition correction 2015-10-06 21:00:53 +02:00
Vincent Demeester
39b035f0b0 Merge pull request #36 from ldez/feature/front-design-refresh
New dashboard with auto refresh
2015-10-05 23:48:51 +02:00
Fernandez Ludovic
a06388d8e3 docs(dashboard): add screenshot
- doc style review
- add section "Web UI" with screenshot
2015-10-05 23:30:33 +02:00
Fernandez Ludovic
8cb2dc3347 feat(dashboard): add vendor dependencies 2015-10-05 23:30:32 +02:00
Fernandez Ludovic
ac57dda074 feat(dashboard): new Dashboard
- show providers (auto refresh: 2s)
- show health (auto refresh: 3s)
- more colors
- add font
- remove jumbotron
- javascript minified version
2015-10-05 23:30:31 +02:00
Fernandez Ludovic
da3d119a43 feat(front): project struture 2015-10-05 23:23:09 +02:00
Fernandez Ludovic
cd94f0172a docs: markdown style review 2015-10-05 23:23:09 +02:00
Fernandez Ludovic
a7a942fbeb feat: API REST endpoint review 2015-10-05 23:23:08 +02:00
Fernandez Ludovic
dece3bbf13 feat(front): tools configuration
- gitignore
- jshint
- editorConfig
2015-10-05 16:30:26 +02:00
Fernandez Ludovic
4c327ec8d5 feat(front): delete old static content 2015-10-05 16:30:25 +02:00
Emile Vauge
25b7547267 Merge pull request #33 from vdemeester/fix-README
Fix README :3
2015-10-04 22:28:46 +02:00
Vincent Demeester
1495700139 Fix README :3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 21:36:33 +02:00
Vincent Demeester
992978215b Merge pull request #32 from EmileVauge/emilevauge-libkv
libkv support
2015-10-04 19:05:54 +02:00
emile
ffbfc2d901 libkv docs 2015-10-04 18:50:54 +02:00
emile
0b3928dafb Add /api/providers API 2015-10-03 16:50:53 +02:00
emile
93b5410987 libkv support https://github.com/EmileVauge/traefik/issues/25 https://github.com/EmileVauge/traefik/issues/9 2015-10-02 11:36:16 +02:00
Vincent Demeester
cdcd5a2b68 Merge pull request #12 from thorhs/multi_provider_config_updates
Adding caching and merging of configurations
2015-09-29 11:02:39 +01:00
Emile Vauge
537c5c18dd Merge pull request #27 from vdemeester/setup-integration-tests
Setup integration tests \o/
2015-09-29 00:02:06 +02:00
Vincent Demeester
27c8029a60 Merge branch 'master' into setup-integration-tests 2015-09-28 22:45:05 +01:00
Emile Vauge
62ee9b3c0d Merge pull request #20 from EmileVauge/configuration-enhancements
Configuration on cicuitbreakers and load balancers
2015-09-28 23:42:19 +02:00
Vincent Demeester
c088fdefa1 Use curl to wait for docker to be up on circleci…
… <3 @emilevauge :D

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-28 23:18:15 +02:00
emile
0bdd537fb4 Configuration on cicuitbreakers and load balancers 2015-09-28 23:16:32 +02:00
Vincent Demeester
ecbfbd4de0 Make fixtures files template-able :)
So it can adapt to certain env (like tcp vs unix socket for docker suite)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-28 22:46:45 +02:00
Vincent Demeester
ad60b301b7 Add initial test-integration suites
Uses go-check in order to separate integration tests into suites, and
have Setup and TearDown operations (on Suites and Tests) ; and use
libcompose to start the external dependencies to test on (like consul,
marathon, etcd, some http images, etc..).

- Update Godeps to get dependencies needed for the use of libcompose
- Setup initial suites and go-check + libcompose mini-framework
- Add some hacks related to libcompose, will be fixed later (when fixed
  upstream)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-28 20:29:35 +02:00
Vincent Demeester
a5a8d6929e Update build toolchain to the use of docker…
… for integration tests.

- Update circle.yml to start the docker daemon listening on TCP (to be
  able to talk to it from the container running test-integration)
- Update script/test-integration to prepare the use of go-check
- Update Makefile in order to run less "binary" target and setting up
  the right environment variable for the builds

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-28 20:27:59 +02:00
Vincent Demeester
47015433cc Split binary into 2
- binary (simple traefik build)
- crossbinary, cross build using gox

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-28 20:27:59 +02:00
Vincent Demeester
4fb25ca358 Merge pull request #24 from EmileVauge/zero-downtime-reload
Zero downtime reload
2015-09-28 19:18:51 +01:00
Vincent Demeester
f8a7127713 Merge branch 'master' into zero-downtime-reload 2015-09-28 18:52:08 +01:00
Vincent Demeester
14e1234b47 Merge pull request #29 from EmileVauge/asciinema-demo
Asciinema demo
2015-09-28 18:46:20 +01:00
emile
b1ad971bde Asciinema demo added 2015-09-28 18:43:36 +02:00
Emile Vauge
a97827527f Merge branch 'master' into zero-downtime-reload 2015-09-28 18:21:37 +02:00
emile
6d06f1a862 graceful shutdown using manners 2015-09-28 18:20:30 +02:00
Vincent Demeester
89e297db02 Merge pull request #28 from EmileVauge/benchmarks
Added benchmarks https://github.com/EmileVauge/traefik/issues/22
2015-09-28 07:23:42 +01:00
emile
db4f3f64fa Added benchmarks https://github.com/EmileVauge/traefik/issues/22 2015-09-26 15:10:14 +02:00
Vincent Demeester
bbfd6c7257 Merge pull request #23 from EmileVauge/certificates-docker-image
Corrects #21 — add certificates to docker image
2015-09-26 11:33:17 +02:00
emile
9edd4874ac refactoring server 2015-09-25 22:02:55 +02:00
emile
71bb22fd0a Corrects https://github.com/EmileVauge/traefik/issues/21 2015-09-25 17:46:52 +02:00
Emile Vauge
ce1d14d779 Merge pull request #18 from thorhs/marathon_get_prefixes
Add getPrefixes to get string array of PathPrefixes
2015-09-24 22:30:14 +02:00
emile
bb12e1c48c URL case corrections 2015-09-24 22:17:40 +02:00
emile
21b876f3d4 Merge branch 'vdemeester-typos-and-imports' 2015-09-24 20:17:42 +02:00
emile
c89f171b54 Merge branch 'typos-and-imports' of https://github.com/vdemeester/traefik into vdemeester-typos-and-imports 2015-09-24 20:17:27 +02:00