 Jason Wilder
|
1e7136470e
Merge pull request #276 from appropriate/nginx-1.9.6
|
10 lat temu |
 Mike Dillon
|
5404938797
Update to nginx 1.9.6
|
10 lat temu |
|
Jason Wilder
|
defed25585
Merge pull request #265 from thomasleveil/makefile
|
10 lat temu |
 Thomas LEVEIL
|
66d401c075
makefile: update docker images before running tests
|
10 lat temu |
|
Jason Wilder
|
1ea74e9b0a
Merge pull request #264 from jwilder/jw-tests
|
10 lat temu |
 Jason Wilder
|
db7a5ab2ae
Use make test from circle.yml
|
10 lat temu |
|
Jason Wilder
|
e09550febb
Add Makefile
|
10 lat temu |
|
Jason Wilder
|
1786edd87d
Update .dockerignore to recent file additions
|
10 lat temu |
|
Jason Wilder
|
1670bccd17
Merge pull request #262 from mariusGundersen/master
|
10 lat temu |
|
Jason Wilder
|
b075fcf250
Merge pull request #260 from appropriate/test-trap-term
|
10 lat temu |
 Marius Gundersen
|
3e530a0784
Use latest docker-gen
|
10 lat temu |
|
Marius Gundersen
|
1e0b930174
trim whitespace from host and port
|
10 lat temu |
|
Mike Dillon
|
098b058b0d
Trap TERM to allow quicker exit of web containers
|
10 lat temu |
|
Jason Wilder
|
f819a4e2e7
Merge pull request #257 from appropriate/osx-fix-test-suite
|
10 lat temu |
|
Mike Dillon
|
1d9db94535
Use docker:1.7 image to match CircleCI's version
|
10 lat temu |
|
Mike Dillon
|
5c6a63568d
Remove --rm from docker run commands
|
10 lat temu |
|
Mike Dillon
|
6e7ff3451b
Remove commented out line
|
10 lat temu |
|
Mike Dillon
|
ec393e3d18
Pull additional images needed for Circle CI
|
10 lat temu |
|
Mike Dillon
|
30e565f0ed
Check "docker version" from a sibling container
|
10 lat temu |
|
Mike Dillon
|
b1a08843da
Avoid breakage from IFS being reset in "run"
|
10 lat temu |
|
Mike Dillon
|
0d2bc38179
Run curl commands from a sibling container
|
10 lat temu |
|
Mike Dillon
|
2cba8a8d5f
Avoid xargs -r
|
10 lat temu |
|
Mike Dillon
|
5fe9411d88
Change line endings to Unix
|
10 lat temu |
|
Jason Wilder
|
df6778f673
Merge pull request #256 from thomasleveil/patch-1
|
10 lat temu |
 Thomas LÉVEIL
|
99560da65c
fix CircleCI badge link
|
10 lat temu |
|
Jason Wilder
|
495b0ad8b6
Add circleci build status badge
|
10 lat temu |
|
Jason Wilder
|
289a519dce
Merge pull request #246 from thomasleveil/fix/197
|
10 lat temu |
|
Jason Wilder
|
a81bb961e4
Merge pull request #252 from lsde/master
|
10 lat temu |
 Jonas Svatos
|
5c2280df84
fix condition for default config location
|
10 lat temu |
|
Jason Wilder
|
2ffa3a182f
Merge pull request #248 from appropriate/missing-access-log
|
10 lat temu |
