zombi/nginx-proxy
Archived
11
0
Fork 0
Code Issues Pull requests Releases Activity
144 commits 1 branch 4 tags 229 KiB
Commit graph

144 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Dillon f95ff82ad0 Adjust entrypoint to always warn on missing socket 
Also chmod the entrypoint
 2015-09-12 07:23:36 -07:00
Thomas LEVEIL 1aac996019 conform to Docker official images best practices 
https://github.com/docker-library/official-images/blob/master/README.md#consistency
 2015-09-12 10:37:21 +00:00
Thomas LEVEIL d83ba3da1e refuse to start if the docker sock isn't available 2015-09-11 23:42:44 +00:00
Jason Wilder 24859e3f92 Merge pull request #220 from RichLewis007/RichLewis007-patch-typos-1 
fix 2 minor English language typos
 2015-08-19 22:34:22 -06:00
Rich 235528338c fix 2 minor English language typos 2015-08-19 23:52:54 -04:00
Jason Wilder 23ae831198 Merge pull request #202 from webner/default_host 
set default_server also for https
 2015-08-11 23:41:53 -06:00
Wolfgang Ebner 6965b1ead4 fallback when DEFAULT_HOST is not set 2015-07-26 11:38:45 +02:00
Wolfgang Ebner b0647dd5e9 set default_server also for https 2015-07-24 10:39:56 +02:00
Jason Wilder e1c685b679 Update boot2docker instructions 2015-07-20 10:05:01 -06:00
Jason Wilder 2d0417692b Merge pull request #192 from viranch/swarm-node 
Use container host's IP:port if we're connected to a swarm master
 2015-07-20 10:00:33 -06:00
Jason Wilder abb42bbc52 Update nginx badge to 1.9.2 2015-07-16 16:55:54 -06:00
Viranch Mehta 4f5351265a Use define & template for re-usable blocks of upstream server template 2015-07-15 20:51:10 +05:30
Viranch Mehta 784507df1a Cascade two else blocks into one using coalesce on VIRTUAL_PORT and 80 
This also takes care of the case when VIRTUAL_PORT is not actually
exposed.
 2015-07-11 01:19:44 +05:30
Jason Wilder 5fe7c4f60d Merge pull request #194 from topiaruss/fix_typos 
Trivial text improvements
 2015-07-07 08:21:56 -06:00
Russ Ferriday dece1e8ef4 Trivial text improvements 2015-07-07 11:07:45 +01:00
Viranch Mehta c4923d1f58 Use container host's IP:port if we're connected to a swarm master 2015-07-04 18:43:52 +05:30
Jason Wilder ae85ec013b Merge pull request #186 from appropriate/prevent-generating-broken-config 
Prevent generating broken config
 2015-06-29 23:40:11 -06:00
Mike Dillon f36ca3d7a3 Prevent generating broken config 
Fixes #115
 2015-06-23 17:05:12 -07:00
Jason Wilder 0bab8934c3 Merge pull request #185 from josephpage/patch-1 
Update to nginx 1.9.2
 2015-06-22 09:35:22 -06:00
Joseph Page 89fe2a3898 Update to nginx 1.9.2 2015-06-20 22:25:52 +02:00
Jason Wilder 7123f31652 Merge pull request #174 from rtrauntvein/173-rodockersock 
Encourage using read-only mount for docker.sock
 2015-06-05 12:58:37 -06:00
Ryan Trauntvein 6719f7636f Encourage using read-only mount for docker.sock 2015-06-05 10:24:45 -07:00
Jason Wilder 02bc7d2c1b Merge pull request #170 from kcyeu/master 
Add support for ssl_dhparam to prevent 'Logjam' attack
 2015-05-22 16:15:02 -06: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
Kuo-Cheng Yeu a10d1b50bf add support for ssl_dhparams to prevent 'Logjam' attack 2015-05-21 15:19:58 +08:00
Jason Wilder 2b270c9353 Merge pull request #168 from bprodoehl/master 
Fix a couple things in the README.
 2015-05-19 14:53:00 -06: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
Jason Wilder 11a8e51620 Merge pull request #163 from mko-x/close-non-ws 
Close marker instead of empty
 2015-05-10 23:16:37 -06:00
Markus Kosmal b680fb003e Close marker instead of empty 2015-05-09 23:15:26 +02:00
Jason Wilder 05a80c150a Merge pull request #152 from kcyeu/master 
Add SPDY support
 2015-05-03 22:46:33 -06:00
Jason Wilder ad4be3b2e4 Merge pull request #154 from appropriate/nginx-1.9 
Update base image to nginx:1.9.0
 2015-05-03 22:46:07 -06:00
Mike Dillon 94fd06b98c Update README.md to refer to nginx 1.9.0 2015-05-02 15:57:48 -07:00
Mike Dillon 7eb785cec5 Update base image to nginx:1.9.0 2015-05-01 14:01:30 -07:00
Kuo-Cheng Yeu 4d2403b5d7 Add SPDY support 2015-04-29 14:41:25 +08:00
Jason Wilder 44a5322ce7 Merge pull request #142 from schmunk42/patch-1 
show command on multiple lines, increased readability
 2015-04-09 16:10:13 -06:00
Tobias Munk ce3f1fa7ca show command on multiple lines, increased readability 2015-04-09 22:08:59 +02:00
Jason Wilder 1e56a0e982 Merge pull request #136 from RnbWd/master 
update readme
 2015-03-31 23:18:27 -06:00
David Wisner e4a5d9a510 update 2015-03-31 21:28:02 -07:00
Jason Wilder d87210ef30 Merge pull request #135 from md5/nginx-1.7.11 
Update to Nginx 1.7.11
 2015-03-30 09:07:05 -06:00
Mike Dillon ead1912590 Update to Nginx 1.7.11 2015-03-27 10:11:54 -07:00
Jason Wilder 95df1d225e Update to docker-gen 0.3.9 2015-03-13 17:25:53 -06:00
Jason Wilder 98254dd565 Merge pull request #123 from berfarah/master 
Updated docker-gen version to 0.3.8
 2015-03-13 17:04:45 -06:00
Bernardo Farah 1f426a6e61 Updated docker-gen version to 0.3.8 2015-03-13 14:53:40 -07:00
Jason Wilder 5216c71418 Merge pull request #119 from md5/update-nginx-1.7.10 
Update to nginx:1.7.10
 2015-03-10 23:19:52 -06:00
Mike Dillon 8d885aac1a Update to nginx:1.7.10 2015-03-10 21:15:42 -07:00
Jason Wilder f03c08068b Merge pull request #111 from jwilder/jw-hsts 
Remove includeSubdomains from HSTS header
 2015-03-04 14:00:04 -07:00
Jason Wilder 4a99ac5548 Remove includeSubdomains from HSTS header 
includeSubdomains can lead to issues where not all subdomains are
able to use HTTPS.  This options might be too strict for the general
case: https://www.owasp.org/index.php/HTTP_Strict_Transport_Security.
It can be re-enabled w/ a custom template if needed.

Fixes #109
 2015-02-28 15:50:59 -07:00
Jason Wilder 879bb59d90 Merge pull request #108 from md5/fix-wildcard-https-redirect 
Fix HTTP->HTTPS redirect for wildcard hosts
 2015-02-25 11:37:21 -07:00