|
|
b4d1acbf2d
|
tests: refactoring
|
2015-09-30 23:40:04 +00:00 |
|
|
|
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 |
|
|
|
4bd30f5d2c
|
add test suite. See #197
This test suite is implemented using [bats](https://github.com/sstephenson/bats).
Not all features are tested. For instance ssl features and custom nginx config are missing. Probably others.
This test suite won't work with TravisCI. Too many evenings were wasted trying to overcome [issues](http://stackoverflow.com/questions/32846800/travis-fails-to-stop-docker-containers) that arises only on the TravisCI platform. However it runs on [CircleCI](https://circleci.com) which is also free for opensource projects.
|
2015-09-29 23:46:36 +00:00 |
|
|
|
d46d9ad943
|
Use nginx 1.9.5 badge in readme
|
2015-09-23 17:49:51 +02:00 |
|
|
|
e06d5917a2
|
Use HTTP/2 instead of SPDY
|
2015-09-23 17:48:40 +02:00 |
|
|
|
249fb204f1
|
Use HTTP/2 instead of SPDY
|
2015-09-23 17:47:18 +02:00 |
|
|
|
d45c10ca66
|
Use nginx 1.9.5
|
2015-09-23 17:43:31 +02:00 |
|
|
|
8c193ba7e1
|
Merge pull request #215 from gradecam/feature/customize_improvements
customizability improvements
|
2015-09-12 15:23:53 -06:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
83b0b25c26
|
Merge pull request #228 from berfarah/patch-1
Bumping to latest Docker Gen version
|
2015-09-12 15:00:00 -06:00 |
|
|
|
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 |
|
|
|
d21c6943a2
|
Merge pull request #1 from appropriate/safeguard
Adjust entrypoint to always warn on missing socket
|
2015-09-12 16:52:01 +02:00 |
|
|
|
f95ff82ad0
|
Adjust entrypoint to always warn on missing socket
Also chmod the entrypoint
|
2015-09-12 07:23:36 -07:00 |
|
|
|
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 |
|
|
|
d83ba3da1e
|
refuse to start if the docker sock isn't available
|
2015-09-11 23:42:44 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ae0da36d75
|
Fix bugs in config file from refactor
|
2015-08-29 18:38:43 -06:00 |
|
|
|
e47df7a884
|
Merge pull request #224 from appropriate/remove-boot2docker-instructions
Remove boot2docker-specific instructions
|
2015-08-26 15:46:04 -06:00 |
|
|
|
d066bd32e0
|
Fix for #188 - add SSL server block outside hosts loop
|
2015-08-26 18:35:47 +10:00 |
|
|
|
d3f56468b1
|
Fix for #188 - remove hostname from default SSL block
|
2015-08-26 12:49:59 +10:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
682914dec7
|
Document the need to EXPOSE the proxied port
|
2015-08-23 18:41:30 -07:00 |
|
|
|
924fcd7984
|
Remove error_log setting from nginx.tmpl
It's already set correctly in nginx.conf
|
2015-08-23 09:00:23 -07:00 |
|
|
|
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 |
|
|
|
235528338c
|
fix 2 minor English language typos
|
2015-08-19 23:52:54 -04:00 |
|
|
|
5089bf77dd
|
Update wording in docs as per pull request feedback
|
2015-08-14 12:34:10 -06:00 |
|
|
|
66711ff026
|
Add warning about consequences of incorrectly using proxy_config.conf
|
2015-08-14 12:26:19 -06:00 |
|
|
|
405f4876b9
|
As per pull request feedback, update names to be consistent
|
2015-08-14 12:26:19 -06:00 |
|
|
|
d9ee7ed704
|
Add support for adding options to the location block of a vhost
|
2015-08-14 12:26:19 -06:00 |
|
|
|
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 |
|
|
|
d07a7d7487
|
Fix example command in docs
|
2015-08-14 12:26:19 -06:00 |
|
|
|
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 |
|
|
|
23ae831198
|
Merge pull request #202 from webner/default_host
set default_server also for https
|
2015-08-11 23:41:53 -06:00 |
|
|
|
6965b1ead4
|
fallback when DEFAULT_HOST is not set
|
2015-07-26 11:38:45 +02:00 |
|
|
|
b0647dd5e9
|
set default_server also for https
|
2015-07-24 10:39:56 +02:00 |
|
|
|
e1c685b679
|
Update boot2docker instructions
0.1.0
|
2015-07-20 10:05:01 -06:00 |
|
|
|
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 |
|
|
|
abb42bbc52
|
Update nginx badge to 1.9.2
|
2015-07-16 16:55:54 -06:00 |
|
|
|
4f5351265a
|
Use define & template for re-usable blocks of upstream server template
|
2015-07-15 20:51:10 +05:30 |
|
|
|
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 |
|
|
|
5fe7c4f60d
|
Merge pull request #194 from topiaruss/fix_typos
Trivial text improvements
|
2015-07-07 08:21:56 -06:00 |
|
|
|
dece1e8ef4
|
Trivial text improvements
|
2015-07-07 11:07:45 +01:00 |
|
|
|
c4923d1f58
|
Use container host's IP:port if we're connected to a swarm master
|
2015-07-04 18:43:52 +05:30 |
|
|
|
ae85ec013b
|
Merge pull request #186 from appropriate/prevent-generating-broken-config
Prevent generating broken config
|
2015-06-29 23:40:11 -06:00 |
|
|
|
f36ca3d7a3
|
Prevent generating broken config
Fixes #115
|
2015-06-23 17:05:12 -07:00 |
|
|
|
0bab8934c3
|
Merge pull request #185 from josephpage/patch-1
Update to nginx 1.9.2
|
2015-06-22 09:35:22 -06:00 |
|
|
|
89fe2a3898
|
Update to nginx 1.9.2
|
2015-06-20 22:25:52 +02:00 |
|
