Jason Wilder
795e153c2e
Merge pull request #951 from kamermans/bugfix/ipv6_resolvers
...
Added support for IPv6 DNS servers in resolver generation (issue #938 )
2017-10-20 09:50:56 -06:00
Steve Kamerman
5d503b48cb
Added support for IPv6 DNS servers in resolver generation (issue #938 )
2017-10-19 20:58:34 -04:00
Steve Kamerman
93d90884e2
Implemented NETWORK_ACCESS (squash commit)
2017-10-18 13:29:12 -04:00
Patrick
3156b97f3a
Fallback if container has no IP
...
Sometimes containers will not be assigned an IP (after reboot or due to misconfiguration). This leads to an incorrect "server <missing ip> down;" line in default.conf and crashes nginx.
@therealgambo provided a fix for this: https://github.com/jwilder/nginx-proxy/issues/845
2017-09-13 12:37:06 +02:00
Jason Wilder
f05f7a0ff9
Merge pull request #574 from teohhanhui/ocsp-stapling-chain
...
Enable OCSP stapling if certificate trust chain is provided
2017-08-16 11:53:17 -06:00
Jason Wilder
817db85aae
Merge pull request #898 from remipichon/master
...
Do not bind upstream with 'ingress' network
2017-08-16 10:12:18 -06:00
Jason Wilder
df24d9dff5
Merge pull request #901 from brikou/patch-2
...
Simplify docker-compose.yml example
2017-08-13 15:57:09 -06:00
Brikou CARRE
343791b657
Simplify docker-compose.yml example
...
Remove `container_name` as not required
2017-08-12 07:37:05 +02:00
Remi Pichon
fff84de367
Do not bind upstream with 'ingress' network
...
Merging https://github.com/jwilder/nginx-proxy/pull/774 and a8ee64b059
2017-08-10 12:30:00 +02:00
Teoh Han Hui
065dd7f1ea
Fix build
2017-07-31 17:46:58 +08:00
Teoh Han Hui
dfe7677eb5
Enable OCSP stapling if certificate trust chain is provided
...
Previously disabled in 080a5157e6
2017-07-31 17:46:58 +08:00
Steve Kamerman
0cc71fad49
Add dynamically-computed DNS resolvers to nginx (for PR #574 )
2017-07-31 17:44:27 +08:00
Jason Wilder
6bdd184d6a
Merge pull request #882 from matt-hh/feature/auto-update-from-upstream-nginx
...
Move to 1.13 base image to get auto updates
2017-07-21 08:53:48 -06:00
Matthias Döring
febf85d7e2
Move to 1.13 base image to get auto updates
...
Less maintenance and more security
Resolves #880
2017-07-21 13:45:33 +02:00
耐小心
2eb2ae9c93
support fastcgi
2017-06-24 14:48:05 +08:00
耐小心
29fffd6de8
Revert "support fastcgi"
...
This reverts commit 8ac755e1d6
.
2017-06-24 14:05:42 +08:00
NaiXiaoXin
8ac755e1d6
support fastcgi
2017-06-24 13:51:02 +08:00
Jason Wilder
02121df3b9
Merge pull request #589 from kamermans/feature_ssl_improvement
...
SSL security enhancement
2017-06-22 11:54:51 -06:00
Jason Wilder
14779ec4be
Merge pull request #860 from jwilder/jw-travis
...
Update docker
2017-06-22 11:46:48 -06:00
Jason Wilder
a318b57408
Update docker
2017-06-22 11:36:40 -06:00
Jason Wilder
57a33aaf8b
Merge pull request #849 from Neilpang/Branch_0.6.0
...
running proxy on host network
2017-06-22 09:50:39 -06:00
Steve Kamerman
026ba7cdac
Added DHParam compatibility note
2017-06-18 21:30:59 -04:00
Steve Kamerman
761bbf9dbc
Removed duplicate server_names_hash_bucket_size directive
2017-06-18 21:21:05 -04:00
Jason Wilder
c41186a3a4
Merge branch 'master' into feature_ssl_improvement
2017-06-14 16:31:12 -06:00
Jason Wilder
90b62e0abc
Merge pull request #851 from Neilpang/worker_processes
...
fix worker_processes to "auto"
2017-06-12 19:23:29 -06:00
neil
a3cd96ead4
alpine fix worker_processes to "auto"
2017-06-13 09:11:27 +08:00
Jason Wilder
e3b6be79fc
Merge pull request #847 from jwilder/appropriate-trim-earlier
...
Trim $host and $proto before they are used
2017-06-12 09:48:27 -06:00
neil
1867228cce
fix worker_processes to "auto"
2017-06-12 15:59:55 +08:00
neilpang
a8ee64b059
running proxy on host network
2017-06-10 15:07:45 +08:00
Jason Wilder
4e4733f68e
Trim $host and $proto before they are used
2017-06-09 12:55:39 -06:00
Jason Wilder
23a2c7d848
Merge pull request #812 from thueske/master
...
Upgrade to 1.13.0
2017-05-04 15:39:57 -06:00
Tobias Hüske
2c4102d396
Upgrade to 1.13.0
2017-05-04 18:57:00 +02:00
Jason Wilder
fed6df3756
Merge pull request #768 from thomasleveil/wildcard_cert_nohttps
...
TESTS: add test for wildcard cert + nohttps + default.crt
2017-05-03 17:02:40 -06:00
Jason Wilder
965c722344
Merge pull request #810 from rtalvarez/readme-typo
...
Fix README typo
2017-05-03 16:57:40 -06:00
Roberto Alvarez
f2487741dc
Fix README typo
...
Fixed a small typo/error with "the a" host
2017-05-03 11:06:34 -05:00
Jason Wilder
b6a445b1a9
Merge pull request #790 from versada/fix-typo
...
DOC: fixed typo
2017-04-11 10:48:12 -06:00
Naglis Jonaitis
cf88817355
DOC: fixed typo
2017-04-11 11:43:47 +03:00
Jason Wilder
851b0e36cd
Merge pull request #789 from matt-hh/feature/upgrade-1.11.13
...
Upgrade to nginx 1.11.13
2017-04-07 09:38:33 -06:00
Matthias Döring
172d79aff4
Upgrade to nginx 1.11.13
2017-04-07 12:58:49 +02:00
Jason Wilder
619943ac1e
Merge pull request #770 from sischnei/http2-in-readme
...
Updated README to include HTTP/2.0
2017-03-18 09:38:16 -06:00
sischnei
6fd32b5a9b
Updated README to include HTTP/2.0
2017-03-18 10:52:43 +01:00
Thomas LEVEIL
8414a94d59
TESTS: add test for the case in which a wildcard cert matches a container having nohttps
set
2017-03-15 02:12:07 +01:00
Jason Wilder
82133865d4
Merge pull request #767 from thomasleveil/patch-1
...
DOC: reflect change from PR #344
2017-03-14 18:57:53 -06:00
Thomas LÉVEIL
77e022cf28
DOC: reflect change from PR #344
...
PR #344 changed the HTTP status code from `503` to `500`. The README.md file was not updated accordingly.
2017-03-15 01:32:47 +01:00
Thomas LEVEIL
de2f057c10
TESTS: add test for unreachable container
...
resulting in an empty `upstream {}` block in the generated nginx config file
2017-03-08 21:21:32 +01:00
Thomas LEVEIL
6dfc3f3f70
TESTS: add stress test when a certificate file is missing
2017-03-08 21:21:32 +01:00
Thomas LEVEIL
e25c78b00a
TESTS: add pytest incremental
marker to mark tests as expected to fail if previous test failed
...
see http://stackoverflow.com/a/12579625/107049
2017-03-08 21:21:32 +01:00
Thomas LEVEIL
a3fbaa5990
TESTS: add directory for tests featuring scenarios trying to make nginx-proxy fail
2017-03-08 21:21:32 +01:00
Steve Kamerman
6912414750
Merge branch 'master' into feature_ssl_improvement
2017-03-08 11:31:01 -05:00
Steve Kamerman
e373a5199b
Merge branch 'master' into feature_ssl_improvement
2017-03-08 10:49:02 -05:00