 Jason Wilder
|
c30640b024
|
Remove circle.yml
Using travis now
|
2016-05-04 16:05:03 -06:00 |
|
|
Jason Wilder
|
e964b9d29f
|
Merge pull request #441 from jwilder/jw-0.7.1
Update to docker-gen 0.7.1
|
2016-05-04 16:03:52 -06:00 |
|
|
Jason Wilder
|
5b9264d945
|
Merge pull request #298 from kamermans/master
Added env var to disable SSL redirect
|
2016-05-01 17:45:45 -06:00 |
|
|
Jason Wilder
|
1c98df2de4
|
Merge pull request #337 from baptistedonaux/master
Support Overlay Network
|
2016-05-01 17:35:48 -06:00 |
|
|
Jason Wilder
|
a72c7e6e20
|
Add docker hub badges
|
2016-04-22 09:56:21 -06:00 |
|
|
Jason Wilder
|
48c31836be
|
Merge pull request #407 from jwilder/jw-travis
Add travis.yml
|
2016-04-04 17:27:12 -06:00 |
|
|
Jason Wilder
|
59f8d4301a
|
Merge pull request #406 from jwilder/jw-forego
Switch forego downloads
|
2016-04-04 16:56:49 -06:00 |
|
|
Jason Wilder
|
6adc04be83
|
Merge pull request #396 from pitkley/docker-gen-0.7.0
Update to docker-gen 0.7.0
|
2016-03-23 11:33:00 -06:00 |
|
|
Jason Wilder
|
f2966c5db1
|
Merge pull request #374 from mrohland/master
updated to nginx 1.9.12
|
2016-03-21 16:28:18 -06:00 |
|
|
Jason Wilder
|
87d0c68aac
|
Merge pull request #371 from gabriel403/patch-1
Mention the docker-compose networking issues
|
2016-03-03 15:35:43 -07:00 |
|
|
Jason Wilder
|
2b24c1712a
|
Merge pull request #342 from schmunk42/feature/updated-nginx
updated nginx to 1.9.9
|
2016-02-14 16:20:48 -07:00 |
|
|
Jason Wilder
|
f42bf9175d
|
Merge pull request #314 from thomasleveil/circleci-docker1.9.1
CircleCI: make tests run on Docker 1.9.1
|
2015-12-15 07:38:25 -07:00 |
|
|
Jason Wilder
|
205b391677
|
Merge pull request #277 from TravisDart/master
Typo fix.
|
2015-10-30 15:11:37 -06: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 |
|
|
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 |
|
|
Jason Wilder
|
1ea74e9b0a
|
Merge pull request #264 from jwilder/jw-tests
Testing fixups
|
2015-10-14 11:02:33 -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 |
|
|
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 |
|
|
Jason Wilder
|
df6778f673
|
Merge pull request #256 from thomasleveil/patch-1
fix CircleCI badge link
|
2015-10-09 09:53:38 -06: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 |
|
|
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 |
|
|
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 |
|