Commit Graph
232 Commits
Author SHA1 Message Date
Hadrien Mary 1ff5e4e9fd Fix Dockerfie (again) 2015-11-26 10:31:18 +01:00
Hadrien Mary 007407f0c6 Fix Dockerfile 2015-11-26 10:22:21 +01:00
Hadrien Mary 4337ca97e4 Remove build.sh (it makes the docker build process painfull) 2015-11-26 10:21:58 +01:00
Hadrien Mary 4968fad44f Update README 2015-11-26 10:21:20 +01:00
David Parrish 4ee670d282 Merge pull request #2 from JrCs/master
Use jwilder/nginx-proxy as base image and reduce final image size
2015-11-24 18:50:01 -05:00
David Parrish a610fb1e39 Use jwilder/nginx-proxy as base image and reduce final image size 2015-11-24 22:05:27 +01:00
David Parrish 81fc692512 Update README.md
Spelling
2015-11-23 00:03:14 -05:00
David Parrish c1d277e299 Merge pull request #1 from JrCs/master
Merge JrCs letsencrypt_service improvements

- Create new certificate for each domain instead of trying to combine domains into one certificate
- Enhance letsencrypt_service so that new or updated containers don't wait for new certificates
2015-11-22 21:01:02 -05:00
JrCs 1a4422ecb3 Enhance update of certificates
Update or create the certificates as soon as possible
2015-11-22 23:39:14 +01:00
JrCs 5bcb1956a8 Fix multi-domain support 2015-11-22 23:39:14 +01:00
David Parrish b8b4d385be Remove semicolon. Spelling fix. Variable name change. 2015-11-22 17:26:49 -05:00
JrCs 1ee83cc0f6 Get real production certificates
Update server URL to use the production ready API URL.
2015-11-22 12:19:27 +01:00
JrCs 7f85f7c4af Avoid displaying unecessary errors
Avoid 'ln: failed to create symbolic link' errors
2015-11-22 11:46:15 +01:00
David Parrish 98f43a905a Clean up Dockerfile. Remove comments 2015-11-21 18:50:32 -05:00
David Parrish 51920bef7c Remove unneeded VOLUME from Dockerfile 2015-11-21 18:47:28 -05:00
David Parrish dafe85ac94 Remove unneeded file 2015-11-21 18:06:12 -05:00
David Parrish 24d7fe0884 Update README.md 2015-11-21 18:05:18 -05:00
David Parrish dbafbd184f Update README.md
Add Let's Encrypt documentation to README.md
2015-11-21 18:02:23 -05:00
David Parrish cca8c2d5cd Use simp_le to update certificates and link them to the /etc/nginx/certs directory 2015-11-21 17:52:31 -05:00
David Parrish b89af421f6 Use simp_le client. Use docker-gen to gather data for simp_le 2015-11-21 00:27:45 -05:00
David Parrish 752687a6a6 Add letsencrypt service and configuration to access .well-known directory 2015-11-18 15:42:21 -05:00
David Parrish bc56da5224 Add letsencryptclient and configuration file 2015-11-16 01:28:47 -05:00
Jason Wilder 205b391677 Merge pull request #277 from TravisDart/master
Typo fix.
2015-10-30 15:11:37 -06:00
Travis Dart 8225015c85 Typo fix. 2015-10-30 15:48:01 -05:00
Jason Wilder 588cdf6266 Update email address 2015-10-29 13:32:09 -06:00
Jason Wilder 1e7136470e Merge pull request #276 from appropriate/nginx-1.9.6
Update to nginx 1.9.6
2015-10-29 13:31:34 -06:00
Mike Dillon 5404938797 Update to nginx 1.9.6 2015-10-28 21:29:39 -07:00
Jason Wilder defed25585 Merge pull request #265 from thomasleveil/makefile
makefile: add target to update docker images tests depend on
2015-10-17 16:12:05 -06:00
Thomas LEVEIL 66d401c075 makefile: update docker images before running tests 2015-10-14 19:42:59 +00:00
Jason Wilder 1ea74e9b0a Merge pull request #264 from jwilder/jw-tests
Testing fixups
2015-10-14 11:02:33 -06:00
Jason Wilder db7a5ab2ae Use make test from circle.yml 2015-10-14 10:48:43 -06:00
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