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

201 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Wilder e09550febb Add Makefile 
Make it easier to run tests.
 2015-10-14 10:29:22 -06:00
Jason Wilder 1786edd87d Update .dockerignore to recent file additions 2015-10-14 10:19:50 -06:00
Jason Wilder 1670bccd17 Merge pull request #262 from mariusGundersen/master 
Use trim to handle VIRTUAL_HOST values with spaces
 2015-10-14 09:56:33 -06:00
Jason Wilder b075fcf250 Merge pull request #260 from appropriate/test-trap-term 
Trap TERM to allow quicker exit of web containers
 2015-10-14 09:55:49 -06:00
Marius Gundersen 3e530a0784 Use latest docker-gen 2015-10-13 21:49:19 +02:00
Marius Gundersen 1e0b930174 trim whitespace from host and port 
based on latest docker-gen
 2015-10-13 21:48:59 +02:00
Mike Dillon 098b058b0d Trap TERM to allow quicker exit of web containers 2015-10-12 21:53:52 -07:00
Jason Wilder f819a4e2e7 Merge pull request #257 from appropriate/osx-fix-test-suite 
Fix running test suite under Docker Machine
 2015-10-12 22:43:19 -06:00
Mike Dillon 1d9db94535 Use docker:1.7 image to match CircleCI's version 2015-10-12 21:16:55 -07:00
Mike Dillon 5c6a63568d Remove --rm from docker run commands 
Trying to avoid "Failed to destroy btrfs snapshot" errors on CircleCI
 2015-10-12 20:59:53 -07:00
Mike Dillon 6e7ff3451b Remove commented out line 2015-10-11 11:27:38 -07:00
Mike Dillon ec393e3d18 Pull additional images needed for Circle CI 2015-10-11 11:05:08 -07:00
Mike Dillon 30e565f0ed Check "docker version" from a sibling container 2015-10-11 11:04:00 -07:00
Mike Dillon b1a08843da Avoid breakage from IFS being reset in "run" 
See https://github.com/sstephenson/bats/issues/89
 2015-10-11 10:55:17 -07:00
Mike Dillon 0d2bc38179 Run curl commands from a sibling container 2015-10-09 23:11:03 -07:00
Mike Dillon 2cba8a8d5f Avoid xargs -r 
The -r option is not available on OS X
 2015-10-09 23:10:38 -07:00
Mike Dillon 5fe9411d88 Change line endings to Unix 2015-10-09 23:07:46 -07:00
Jason Wilder df6778f673 Merge pull request #256 from thomasleveil/patch-1 
fix CircleCI badge link
 2015-10-09 09:53:38 -06:00
Thomas LÉVEIL 99560da65c fix CircleCI badge link 2015-10-09 15:33:29 +02:00
Jason Wilder 495b0ad8b6 Add circleci build status badge 2015-10-08 22:08:04 -06:00
Jason Wilder 289a519dce Merge pull request #246 from thomasleveil/fix/197 
add test suite. See #197
 2015-10-08 22:01:15 -06:00
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
Thomas LEVEIL 92be4b6d54 doc 2015-09-30 23:57:13 +00:00
Thomas LEVEIL 865b14e029 tests: fix minor bug in docker_wait_for_log 2015-09-30 23:56:25 +00:00
Thomas LEVEIL b4d1acbf2d tests: refactoring 2015-09-30 23:40:04 +00: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
Thomas LEVEIL 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
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