thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 20:06:30 +00:00
Code Issues Releases Wiki Activity
524 Commits 3 Branches 6 Tags 672 KiB
f68383add9
Commit Graph

524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Munk
627f789f19 updated nginx to 1.9.9 2016-01-20 23:26:21 +01:00
Baptiste Donaux
2eb977589c Complete documentation 2016-01-20 08:54:57 +01:00
Steve Kamerman
99963b4ab0 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-01-18 16:37:03 -05:00
Baptiste Donaux
13bb99c4d2 Update README - Nginx proxy must use host network to support overlay network 2016-01-17 12:35:29 +01:00
Baptiste Donaux
a66115f560 Use new Network interface to support new overlay network 2016-01-17 12:29:55 +01:00
Baptiste Donaux
deb4050fa4 UPGRADE docker-gen release from 0.4.2 to 0.5.0 2016-01-17 12:28:59 +01:00
pabra
51c219d651 connect to uWSGI backends 2015-12-22 21:20:44 +01:00
Jason Wilder
f42bf9175d Merge pull request #314 from thomasleveil/circleci-docker1.9.1 
CircleCI: make tests run on Docker 1.9.1
 2015-12-15 07:38:25 -07:00
Thomas LEVEIL
c11af183d8 CircleCI: make tests run on Docker 1.9.1 
See CircleCI announcement https://discuss.circleci.com/t/docker-1-9-1-is-available/1009
 2015-12-14 09:25:21 +01:00
Steve Kamerman
4a95d84d0d Trying to trigger CI 2015-12-02 21:46:05 -05:00
Steve Kamerman
58fc298dea Semantic change to trigger CI rebuild 2015-12-02 00:29:32 -05:00
Steve Kamerman
4bf7f888d0 Documented HTTPS_METHOD 2015-11-20 17:47:08 -05:00
Steve Kamerman
97c6340a9f Implemented HTTPS noredir 2015-11-20 17:37:06 -05:00
Steve Kamerman
9dd6ad8503 First try at HTTPS_METHOD 2015-11-20 16:53:50 -05:00
Jason Wilder
205b391677 Merge pull request #277 from TravisDart/master 
Typo fix.
 2015-10-30 15:11:37 -06:00
Travis Dart
8225015c85 Typo fix. 2015-10-30 15:48:01 -05:00
Jason Wilder
588cdf6266 Update email address 2015-10-29 13:32:09 -06:00
Jason Wilder
1e7136470e Merge pull request #276 from appropriate/nginx-1.9.6 
Update to nginx 1.9.6
 2015-10-29 13:31:34 -06:00
Mike Dillon
5404938797 Update to nginx 1.9.6 2015-10-28 21:29:39 -07:00
Jason Wilder
defed25585 Merge pull request #265 from thomasleveil/makefile 
makefile: add target to update docker images tests depend on
 2015-10-17 16:12:05 -06:00
Thomas LEVEIL
66d401c075 makefile: update docker images before running tests 2015-10-14 19:42:59 +00:00
Jason Wilder
1ea74e9b0a Merge pull request #264 from jwilder/jw-tests 
Testing fixups
 2015-10-14 11:02:33 -06:00
Jason Wilder
db7a5ab2ae Use make test from circle.yml 2015-10-14 10:48:43 -06:00
Jason Wilder
e09550febb Add Makefile 
Make it easier to run tests.
 2015-10-14 10:29:22 -06:00
Jason Wilder
1786edd87d Update .dockerignore to recent file additions 2015-10-14 10:19:50 -06:00
Jason Wilder
1670bccd17 Merge pull request #262 from mariusGundersen/master 
Use trim to handle VIRTUAL_HOST values with spaces
 2015-10-14 09:56:33 -06:00
Jason Wilder
b075fcf250 Merge pull request #260 from appropriate/test-trap-term 
Trap TERM to allow quicker exit of web containers
 2015-10-14 09:55:49 -06:00
Marius Gundersen
3e530a0784 Use latest docker-gen 2015-10-13 21:49:19 +02:00
Marius Gundersen
1e0b930174 trim whitespace from host and port 
based on latest docker-gen
 2015-10-13 21:48:59 +02:00
Mike Dillon
098b058b0d Trap TERM to allow quicker exit of web containers 2015-10-12 21:53:52 -07:00
Jason Wilder
f819a4e2e7 Merge pull request #257 from appropriate/osx-fix-test-suite 
Fix running test suite under Docker Machine
 2015-10-12 22:43:19 -06:00
Mike Dillon
1d9db94535 Use docker:1.7 image to match CircleCI's version 2015-10-12 21:16:55 -07:00
Mike Dillon
5c6a63568d Remove --rm from docker run commands 
Trying to avoid "Failed to destroy btrfs snapshot" errors on CircleCI
 2015-10-12 20:59:53 -07:00
Mike Dillon
6e7ff3451b Remove commented out line 2015-10-11 11:27:38 -07:00
Mike Dillon
ec393e3d18 Pull additional images needed for Circle CI 2015-10-11 11:05:08 -07:00
Mike Dillon
30e565f0ed Check "docker version" from a sibling container 2015-10-11 11:04:00 -07:00
Mike Dillon
b1a08843da Avoid breakage from IFS being reset in "run" 
See https://github.com/sstephenson/bats/issues/89
 2015-10-11 10:55:17 -07:00
Mike Dillon
0d2bc38179 Run curl commands from a sibling container 2015-10-09 23:11:03 -07:00
Mike Dillon
2cba8a8d5f Avoid xargs -r 
The -r option is not available on OS X
 2015-10-09 23:10:38 -07:00
Mike Dillon
5fe9411d88 Change line endings to Unix 2015-10-09 23:07:46 -07:00
Jason Wilder
df6778f673 Merge pull request #256 from thomasleveil/patch-1 
fix CircleCI badge link
 2015-10-09 09:53:38 -06:00
Thomas LÉVEIL
99560da65c fix CircleCI badge link 2015-10-09 15:33:29 +02:00
Jason Wilder
495b0ad8b6 Add circleci build status badge 2015-10-08 22:08:04 -06:00
Jason Wilder
289a519dce Merge pull request #246 from thomasleveil/fix/197 
add test suite. See #197
 2015-10-08 22:01:15 -06:00
Jason Wilder
a81bb961e4 Merge pull request #252 from lsde/master 
fix condition for default config location
 2015-10-08 20:53:16 -06:00
Jonas Svatos
5c2280df84 fix condition for default config location 
Signed-off-by: Jonas Svatos <jonas.svatos@etnetera.cz>
 2015-10-08 12:03:28 +02:00
Jason Wilder
2ffa3a182f Merge pull request #248 from appropriate/missing-access-log 
Add missing access_log statement to HTTPS fallback
 2015-10-07 09:04:13 -06:00
Mike Dillon
6b5e12a946 Add missing access_log statement to HTTPS fallback 2015-10-06 21:18:00 -07:00
Thomas LEVEIL
92be4b6d54 doc 2015-09-30 23:57:13 +00:00
Thomas LEVEIL
865b14e029 tests: fix minor bug in docker_wait_for_log 2015-09-30 23:56:25 +00:00