Commit Graph
21 Commits
Author SHA1 Message Date
Jason Wilder 9440ebed09 Merge pull request #235 from thomasleveil/safeguard
refuse to start if the docker sock isn't available
2015-09-12 14:56:39 -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
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
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
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
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
Jason Wilder 5fe7c4f60d Merge pull request #194 from topiaruss/fix_typos
Trivial text improvements
2015-07-07 08:21:56 -06:00
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
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
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
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
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
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
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
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
Jason Wilder 1e56a0e982 Merge pull request #136 from RnbWd/master
update readme
2015-03-31 23:18:27 -06: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