Commit graph

78 commits

Author SHA1 Message Date
Jason Wilder
c36b42933d Merge pull request #462 from kamermans/master
Disable HSTS when HTTPS_METHOD=noredirect
2016-06-12 15:28:08 -06:00
Jason Wilder
a0dee5c833 Remove -only-exposed from separate container instructions 2016-06-12 15:25:32 -06:00
Jason Wilder
fdf93cafba Add docker-compose.yml v2 example 2016-06-12 14:10:46 -06:00
Jason Wilder
adf4573de4 Remove Circle CI badge 2016-06-12 10:45:59 -06:00
Jason Wilder
9b0138f944 Remove docker compose v2 notes 2016-06-10 20:11:58 -06:00
Jason Wilder
c256f31728 Update nginx 1.9.15 2016-06-10 20:08:10 -06:00
Steve Kamerman
da3e257843 Removed HSTS when HTTPS_METHOD=noredirect, added tests, improved docs wrt HSTS 2016-05-19 23:20:43 -04:00
Steve Kamerman
3d77979efb Expanded documentation on HTTPS_METHOD 2016-05-19 23:16:19 -04:00
Jason Wilder
5b9264d945 Merge pull request #298 from kamermans/master
Added env var to disable SSL redirect
2016-05-01 17:45:45 -06:00
Jason Wilder
1c98df2de4 Merge pull request #337 from baptistedonaux/master
Support Overlay Network
2016-05-01 17:35:48 -06:00
Jason Wilder
a72c7e6e20 Add docker hub badges 2016-04-22 09:56:21 -06:00
Steve Kamerman
f294582ae8 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-04-20 11:05:20 -04:00
Baptiste Donaux
f66934567e Merge remote-tracking branch 'upstream/master' 2016-04-05 09:22:31 +02:00
Jason Wilder
30e2da01e9 Add travis.yml
From #312
2016-04-04 17:18:05 -06:00
Baptiste Donaux
74fb2acc4b Merge remote-tracking branch 'upstream/master' 2016-03-23 08:52:58 +01:00
Mike Rohland
1f8b480365 moved nginx to 1.9.12 2016-03-21 22:47:01 +01:00
Steve Kamerman
9671e0c1a2 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-03-18 13:47:11 -04:00
Gabriel Baker
d849e5f5d0 Linkify the issue ref 2016-02-23 07:25:32 +00:00
Gabriel Baker
8c6ec27547 Mention the docker-compose issues 2016-02-23 07:23:27 +00:00
Mike Dillon
5c828cb50a Update README wording for overlay networking 2016-01-20 23:30:55 -08:00
Baptiste Donaux
2eb977589c Complete documentation 2016-01-20 08:54:57 +01:00
Baptiste Donaux
13bb99c4d2 Update README - Nginx proxy must use host network to support overlay network 2016-01-17 12:35:29 +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
Travis Dart
8225015c85 Typo fix. 2015-10-30 15:48:01 -05:00
Mike Dillon
5404938797 Update to nginx 1.9.6 2015-10-28 21:29:39 -07:00
Jason Wilder
e09550febb Add Makefile
Make it easier to run tests.
2015-10-14 10:29:22 -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
Aleš Roubíček
d46d9ad943 Use nginx 1.9.5 badge in readme 2015-09-23 17:49:51 +02:00
Jason Wilder
8c193ba7e1 Merge pull request #215 from gradecam/feature/customize_improvements
customizability improvements
2015-09-12 15:23:53 -06:00
Mike Dillon
e5ad1ecfd1 Remove boot2docker-specific instructions
Both boot2docker and docker-machine will work fine with the normal `docker run`
command used in the rest of the docs.
2015-08-24 19:37:45 -07:00
Mike Dillon
682914dec7 Document the need to EXPOSE the proxied port 2015-08-23 18:41:30 -07:00
Rich
235528338c fix 2 minor English language typos 2015-08-19 23:52:54 -04:00
Richard Bateman
5089bf77dd Update wording in docs as per pull request feedback 2015-08-14 12:34:10 -06:00
Richard Bateman
66711ff026 Add warning about consequences of incorrectly using proxy_config.conf 2015-08-14 12:26:19 -06:00
Richard Bateman
d9ee7ed704 Add support for adding options to the location block of a vhost 2015-08-14 12:26:19 -06:00
Richard Bateman
b131b00e19 Add support for vhosts.d/defaults file with default vhost options
- Only used if it exists and a vhost-specific one doesn't
2015-08-14 12:26:19 -06:00
Richard Bateman
d07a7d7487 Fix example command in docs 2015-08-14 12:26:19 -06:00
Richard Bateman
2eff96969a Add support for overriding default proxy settings
- If /etc/nginx/proxy.conf exists use that, otherwise use the default
2015-08-14 12:26:07 -06:00
Jason Wilder
e1c685b679 Update boot2docker instructions 2015-07-20 10:05:01 -06:00
Jason Wilder
abb42bbc52 Update nginx badge to 1.9.2 2015-07-16 16:55:54 -06:00
Russ Ferriday
dece1e8ef4 Trivial text improvements 2015-07-07 11:07:45 +01:00
Ryan Trauntvein
6719f7636f Encourage using read-only mount for docker.sock 2015-06-05 10:24:45 -07:00
Kuo-Cheng Yeu
d74a4146c8 fix indention, and file nameing 2015-05-21 23:43:09 +08:00
Kuo-Cheng Yeu
da0191a778 add 'Diffie-Hellman Groups' section in README.md 2015-05-21 15:37:19 +08:00
Brian Prodoehl
3954774d65 Fix a couple things in the README. 2015-05-19 16:16:50 -04:00
Jason Wilder
503072c03f Merge pull request #72 from BenHall/default_host
Ability to set a default host for nginx
2015-05-14 10:00:04 -06:00
Mike Dillon
94fd06b98c Update README.md to refer to nginx 1.9.0 2015-05-02 15:57:48 -07:00