Commit Graph

  • 63347e82ed Patches for the SSL certificate stuff master madmaurice 2016-07-13 22:43:54 +0200
  • d9d975f2c3 Softline for ssl certificate madmaurice 2016-07-13 21:45:56 +0200
  • a2ab8363ca Merge pull request #483 from jwilder/jw-docker-gen Jason Wilder 2016-06-13 08:18:07 -0600
  • 8ed5ab38b8 Update to docker-gen 0.7.3 Jason Wilder 2016-06-13 00:22:50 -0600
  • db3ef67a7f Merge pull request #482 from jwilder/jw-revert Jason Wilder 2016-06-13 00:21:38 -0600
  • 580517725f Revert 9c93efa Jason Wilder 2016-06-13 00:10:49 -0600
  • d1e6e1c0be Merge pull request #344 from schmunk42/feature/error-code Jason Wilder 2016-06-12 15:54:40 -0600
  • fc619d63ad Merge pull request #460 from kumy/patch-1 Jason Wilder 2016-06-12 15:28:40 -0600
  • c36b42933d Merge pull request #462 from kamermans/master Jason Wilder 2016-06-12 15:28:08 -0600
  • a0dee5c833 Remove -only-exposed from separate container instructions Jason Wilder 2016-06-12 15:25:32 -0600
  • fdfb0becd2 Merge pull request #480 from jwilder/jw-certs Jason Wilder 2016-06-12 14:28:35 -0600
  • fdf93cafba Add docker-compose.yml v2 example Jason Wilder 2016-06-12 13:55:18 -0600
  • b325dad98d Remove -only-exposed from Procfile Jason Wilder 2016-06-12 13:54:48 -0600
  • 9c93efaef9 Fix template error when /etc/nginx/certs does not exist Jason Wilder 2016-06-12 13:11:45 -0600
  • adf4573de4 Remove Circle CI badge Jason Wilder 2016-06-12 10:45:59 -0600
  • 8393a57f1f Merge pull request #477 from jwilder/jw-nginx Jason Wilder 2016-06-10 20:22:07 -0600
  • 9b0138f944 Remove docker compose v2 notes Jason Wilder 2016-06-10 20:11:58 -0600
  • c256f31728 Update nginx 1.9.15 Jason Wilder 2016-06-10 20:08:10 -0600
  • da3e257843 Removed HSTS when HTTPS_METHOD=noredirect, added tests, improved docs wrt HSTS Steve Kamerman 2016-05-19 23:20:43 -0400
  • 3d77979efb Expanded documentation on HTTPS_METHOD Steve Kamerman 2016-05-19 23:15:25 -0400
  • 8c76ea9f9b Fix a typo in comment kumy 2016-05-17 01:46:46 +0200
  • 0ef8dca98c Merge pull request #443 from jwilder/jw-circle 0.4.0 Jason Wilder 2016-05-04 16:52:41 -0600
  • c30640b024 Remove circle.yml Jason Wilder 2016-05-04 16:05:03 -0600
  • e964b9d29f Merge pull request #441 from jwilder/jw-0.7.1 Jason Wilder 2016-05-04 16:03:52 -0600
  • d40d1d4052 Update to docker-gen 0.7.1 Jason Wilder 2016-05-04 14:51:30 -0600
  • 5b9264d945 Merge pull request #298 from kamermans/master Jason Wilder 2016-05-01 17:45:45 -0600
  • 1c98df2de4 Merge pull request #337 from baptistedonaux/master Jason Wilder 2016-05-01 17:35:48 -0600
  • a72c7e6e20 Add docker hub badges 0.3.0 Jason Wilder 2016-04-22 09:56:21 -0600
  • 786a2375aa Using different path method to hopefully fix cert volume issue in CI systems Steve Kamerman 2016-04-20 12:47:14 -0400
  • f296b273ce Normalized indentation, added explicit CERT_NAME Steve Kamerman 2016-04-20 12:33:21 -0400
  • 1d0a5d9194 Added SSL/HTTPS tests Steve Kamerman 2016-04-20 12:20:08 -0400
  • f294582ae8 Merge branch 'master' of https://github.com/jwilder/nginx-proxy Steve Kamerman 2016-04-20 11:05:20 -0400
  • f66934567e Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-04-05 09:22:31 +0200
  • 48c31836be Merge pull request #407 from jwilder/jw-travis Jason Wilder 2016-04-04 17:27:12 -0600
  • 30e2da01e9 Add travis.yml Jason Wilder 2016-04-04 17:01:47 -0600
  • 59f8d4301a Merge pull request #406 from jwilder/jw-forego Jason Wilder 2016-04-04 16:56:49 -0600
  • a54af7d73b Switch forego downloads Jason Wilder 2016-04-04 16:48:52 -0600
  • 6928d62e1e Upgrade Docker dependency from 1.9 to 1.10 Baptiste Donaux 2016-03-24 14:40:50 +0100
  • 88cc096aaf [FIX] expose port for separated containers test Baptiste Donaux 2016-03-24 11:16:22 +0100
  • 6b88365465 Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-03-24 08:41:23 +0100
  • 6adc04be83 Merge pull request #396 from pitkley/docker-gen-0.7.0 Jason Wilder 2016-03-23 11:33:00 -0600
  • 86aea653c8 Update to docker-gen 0.7.0 Pit Kleyersburg 2016-03-22 22:47:42 +0100
  • 74fb2acc4b Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-03-23 08:52:58 +0100
  • f2966c5db1 Merge pull request #374 from mrohland/master Jason Wilder 2016-03-21 16:28:18 -0600
  • 1f8b480365 moved nginx to 1.9.12 Mike Rohland 2016-03-21 22:47:01 +0100
  • 9671e0c1a2 Merge branch 'master' of https://github.com/jwilder/nginx-proxy Steve Kamerman 2016-03-18 13:47:11 -0400
  • 87d0c68aac Merge pull request #371 from gabriel403/patch-1 Jason Wilder 2016-03-03 15:35:43 -0700
  • b42cd85570 Unit test - removed network creation Baptiste Donaux 2016-02-26 09:12:11 +0100
  • 47631eb5de Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-02-25 09:59:04 +0100
  • 2b418319f2 Test to support overlay networks Baptiste Donaux 2016-02-25 09:58:17 +0100
  • 163d1ce174 Upgrade docker-gen from 0.5.0 to 0.7.0 Baptiste Donaux 2016-02-25 08:26:41 +0100
  • ebab7cf2b9 [TEMPLATE] fix variable call Baptiste Donaux 2016-02-23 13:59:30 +0100
  • d849e5f5d0 Linkify the issue ref Gabriel Baker 2016-02-23 07:25:32 +0000
  • 8c6ec27547 Mention the docker-compose issues Gabriel Baker 2016-02-23 07:23:27 +0000
  • 2b24c1712a Merge pull request #342 from schmunk42/feature/updated-nginx Jason Wilder 2016-02-14 16:20:48 -0700
  • 658e20f661 Support container in one network shared with current container Baptiste Donaux 2016-02-05 09:16:43 +0100
  • 9341f54e51 Merge pull request #1 from appropriate/overlay-support Baptiste Donaux 2016-01-22 08:44:43 +0100
  • b4e5f780e3 changed error code for non-usable/default SSL cert, fixes #341 Tobias Munk 2016-01-20 23:28:08 +0100
  • 5c828cb50a Update README wording for overlay networking Mike Dillon 2016-01-20 23:30:55 -0800
  • 627f789f19 updated nginx to 1.9.9 Tobias Munk 2016-01-20 23:26:21 +0100
  • 2eb977589c Complete documentation Baptiste Donaux 2016-01-20 08:54:57 +0100
  • 99963b4ab0 Merge branch 'master' of https://github.com/jwilder/nginx-proxy Steve Kamerman 2016-01-18 16:37:03 -0500
  • 13bb99c4d2 Update README - Nginx proxy must use host network to support overlay network Baptiste Donaux 2016-01-17 12:35:29 +0100
  • a66115f560 Use new Network interface to support new overlay network Baptiste Donaux 2016-01-17 12:29:55 +0100
  • deb4050fa4 UPGRADE docker-gen release from 0.4.2 to 0.5.0 Baptiste Donaux 2016-01-17 12:28:59 +0100
  • f42bf9175d Merge pull request #314 from thomasleveil/circleci-docker1.9.1 Jason Wilder 2015-12-15 07:38:25 -0700
  • c11af183d8 CircleCI: make tests run on Docker 1.9.1 Thomas LEVEIL 2015-12-14 09:18:17 +0100
  • 4a95d84d0d Trying to trigger CI Steve Kamerman 2015-12-02 21:46:05 -0500
  • 58fc298dea Semantic change to trigger CI rebuild Steve Kamerman 2015-12-02 00:29:32 -0500
  • 4bf7f888d0 Documented HTTPS_METHOD Steve Kamerman 2015-11-20 17:47:08 -0500
  • 97c6340a9f Implemented HTTPS noredir Steve Kamerman 2015-11-20 17:36:12 -0500
  • 9dd6ad8503 First try at HTTPS_METHOD Steve Kamerman 2015-11-20 16:53:50 -0500
  • 205b391677 Merge pull request #277 from TravisDart/master Jason Wilder 2015-10-30 15:11:37 -0600
  • 8225015c85 Typo fix. Travis Dart 2015-10-30 15:48:01 -0500
  • 588cdf6266 Update email address Jason Wilder 2015-10-29 13:32:09 -0600
  • 1e7136470e Merge pull request #276 from appropriate/nginx-1.9.6 Jason Wilder 2015-10-29 13:31:34 -0600
  • 5404938797 Update to nginx 1.9.6 Mike Dillon 2015-10-28 21:23:37 -0700
  • defed25585 Merge pull request #265 from thomasleveil/makefile Jason Wilder 2015-10-17 16:12:05 -0600
  • 66d401c075 makefile: update docker images before running tests Thomas LEVEIL 2015-10-14 19:34:30 +0000
  • 1ea74e9b0a Merge pull request #264 from jwilder/jw-tests Jason Wilder 2015-10-14 11:02:33 -0600
  • db7a5ab2ae Use make test from circle.yml Jason Wilder 2015-10-14 10:48:43 -0600
  • e09550febb Add Makefile Jason Wilder 2015-10-14 10:29:22 -0600
  • 1786edd87d Update .dockerignore to recent file additions Jason Wilder 2015-10-14 10:19:50 -0600
  • 1670bccd17 Merge pull request #262 from mariusGundersen/master Jason Wilder 2015-10-14 09:56:33 -0600
  • b075fcf250 Merge pull request #260 from appropriate/test-trap-term Jason Wilder 2015-10-14 09:55:49 -0600
  • 3e530a0784 Use latest docker-gen Marius Gundersen 2015-10-13 21:49:19 +0200
  • 1e0b930174 trim whitespace from host and port Marius Gundersen 2015-10-13 21:48:59 +0200
  • 098b058b0d Trap TERM to allow quicker exit of web containers Mike Dillon 2015-10-12 21:46:47 -0700
  • f819a4e2e7 Merge pull request #257 from appropriate/osx-fix-test-suite Jason Wilder 2015-10-12 22:43:19 -0600
  • 1d9db94535 Use docker:1.7 image to match CircleCI's version Mike Dillon 2015-10-12 21:16:55 -0700
  • 5c6a63568d Remove --rm from docker run commands Mike Dillon 2015-10-12 20:59:53 -0700
  • 6e7ff3451b Remove commented out line Mike Dillon 2015-10-11 11:27:38 -0700
  • ec393e3d18 Pull additional images needed for Circle CI Mike Dillon 2015-10-11 11:04:34 -0700
  • 30e565f0ed Check "docker version" from a sibling container Mike Dillon 2015-10-11 11:04:00 -0700
  • b1a08843da Avoid breakage from IFS being reset in "run" Mike Dillon 2015-10-11 10:55:17 -0700
  • 0d2bc38179 Run curl commands from a sibling container Mike Dillon 2015-10-09 23:11:03 -0700
  • 2cba8a8d5f Avoid xargs -r Mike Dillon 2015-10-09 23:10:38 -0700
  • 5fe9411d88 Change line endings to Unix Mike Dillon 2015-10-09 23:07:46 -0700
  • df6778f673 Merge pull request #256 from thomasleveil/patch-1 Jason Wilder 2015-10-09 09:53:38 -0600
  • 99560da65c fix CircleCI badge link Thomas LÉVEIL 2015-10-09 15:33:29 +0200