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

176 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Wilder a81bb961e4 Merge pull request #252 from lsde/master 
fix condition for default config location
 2015-10-08 20:53:16 -06:00
Jonas Svatos 5c2280df84 fix condition for default config location 
Signed-off-by: Jonas Svatos <jonas.svatos@etnetera.cz>
 2015-10-08 12:03:28 +02:00
Jason Wilder 2ffa3a182f Merge pull request #248 from appropriate/missing-access-log 
Add missing access_log statement to HTTPS fallback
 2015-10-07 09:04:13 -06:00
Mike Dillon 6b5e12a946 Add missing access_log statement to HTTPS fallback 2015-10-06 21:18:00 -07:00
Jason Wilder 3f223abeb8 Merge pull request #240 from rarous/master 
Update to nginx 1.9.5 with HTTP/2 support
 2015-09-30 12:01:09 -06:00
Aleš Roubíček d46d9ad943 Use nginx 1.9.5 badge in readme 2015-09-23 17:49:51 +02:00
Aleš Roubíček e06d5917a2 Use HTTP/2 instead of SPDY 2015-09-23 17:48:40 +02:00
Aleš Roubíček 249fb204f1 Use HTTP/2 instead of SPDY 2015-09-23 17:47:18 +02:00
Aleš Roubíček d45c10ca66 Use nginx 1.9.5 2015-09-23 17:43:31 +02:00
Jason Wilder 8c193ba7e1 Merge pull request #215 from gradecam/feature/customize_improvements 
customizability improvements
 2015-09-12 15:23:53 -06:00
Jason Wilder bddb647b5f Merge pull request #230 from appropriate/remove_duplicate_access_log_entries 
Remove duplicate access log entries
 2015-09-12 15:12:31 -06:00
Jason Wilder 9e55f5382f Merge pull request #225 from funkygibbing/default-ssl 
Fix for #188 - remove hostname from default SSL block
 2015-09-12 15:05:53 -06:00
Jason Wilder 83b0b25c26 Merge pull request #228 from berfarah/patch-1 
Bumping to latest Docker Gen version
 2015-09-12 15:00:00 -06:00
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
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