Thomas LÉVEIL
|
d21c6943a2
|
Merge pull request #1 from appropriate/safeguard
Adjust entrypoint to always warn on missing socket
|
2015-09-12 16:52:01 +02:00 |
|
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 |
|
Mike Dillon
|
900a676af8
|
Move access_log from the http level to server
This prevents duplicate access_log entries from being written for each request
|
2015-09-03 08:33:33 -07:00 |
|
Bernardo Farah
|
d844c124ff
|
Bumping to latest Docker Gen version
As per [this](https://github.com/jwilder/docker-gen/issues/114) ticket. Thanks again!
|
2015-09-01 09:38:43 -07:00 |
|
CoreOS Admin
|
ae0da36d75
|
Fix bugs in config file from refactor
|
2015-08-29 18:38:43 -06:00 |
|
Jason Wilder
|
e47df7a884
|
Merge pull request #224 from appropriate/remove-boot2docker-instructions
Remove boot2docker-specific instructions
|
2015-08-26 15:46:04 -06:00 |
|
Ray Walker
|
d066bd32e0
|
Fix for #188 - add SSL server block outside hosts loop
|
2015-08-26 18:35:47 +10:00 |
|
Ray Walker
|
d3f56468b1
|
Fix for #188 - remove hostname from default SSL block
|
2015-08-26 12:49:59 +10: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 |
|
Jason Wilder
|
214ff827d3
|
Merge pull request #223 from appropriate/readme-expose-requirement
Document the need to EXPOSE the proxied port
|
2015-08-23 20:59:51 -06:00 |
|
Mike Dillon
|
682914dec7
|
Document the need to EXPOSE the proxied port
|
2015-08-23 18:41:30 -07:00 |
|
Mike Dillon
|
924fcd7984
|
Remove error_log setting from nginx.tmpl
It's already set correctly in nginx.conf
|
2015-08-23 09:00:23 -07: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 |
|
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
|
405f4876b9
|
As per pull request feedback, update names to be consistent
|
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
|
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 |
|