f296b273ce
Normalized indentation, added explicit CERT_NAME
2016-04-20 12:33:21 -04:00
1d0a5d9194
Added SSL/HTTPS tests
2016-04-20 12:20:08 -04:00
f294582ae8
Merge branch 'master' of https://github.com/jwilder/nginx-proxy
2016-04-20 11:05:20 -04:00
48c31836be
Merge pull request #407 from jwilder/jw-travis
...
Add travis.yml
2016-04-04 17:27:12 -06:00
30e2da01e9
Add travis.yml
...
From #312
2016-04-04 17:18:05 -06:00
59f8d4301a
Merge pull request #406 from jwilder/jw-forego
...
Switch forego downloads
2016-04-04 16:56:49 -06:00
a54af7d73b
Switch forego downloads
...
Official ddollar site has been down for a while and not sure if it's
coming back up or not.
2016-04-04 16:48:52 -06:00
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
86aea653c8
Update to docker-gen 0.7.0
...
Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).
This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.
Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.
The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.
[1]: 50435652b1
2016-03-23 17:45:34 +01:00
f2966c5db1
Merge pull request #374 from mrohland/master
...
updated to nginx 1.9.12
2016-03-21 16:28:18 -06:00
1f8b480365
moved nginx to 1.9.12
2016-03-21 22:47:01 +01:00
9671e0c1a2
Merge branch 'master' of https://github.com/jwilder/nginx-proxy
2016-03-18 13:47:11 -04:00
87d0c68aac
Merge pull request #371 from gabriel403/patch-1
...
Mention the docker-compose networking issues
2016-03-03 15:35:43 -07:00
d849e5f5d0
Linkify the issue ref
2016-02-23 07:25:32 +00:00
8c6ec27547
Mention the docker-compose issues
2016-02-23 07:23:27 +00:00
2b24c1712a
Merge pull request #342 from schmunk42/feature/updated-nginx
...
updated nginx to 1.9.9
2016-02-14 16:20:48 -07:00
627f789f19
updated nginx to 1.9.9
2016-01-20 23:26:21 +01:00
99963b4ab0
Merge branch 'master' of https://github.com/jwilder/nginx-proxy
2016-01-18 16:37:03 -05:00
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
c11af183d8
CircleCI: make tests run on Docker 1.9.1
...
See CircleCI announcement https://discuss.circleci.com/t/docker-1-9-1-is-available/1009
2015-12-14 09:25:21 +01:00
4a95d84d0d
Trying to trigger CI
2015-12-02 21:46:05 -05:00
58fc298dea
Semantic change to trigger CI rebuild
2015-12-02 00:29:32 -05:00
4bf7f888d0
Documented HTTPS_METHOD
2015-11-20 17:47:08 -05:00
97c6340a9f
Implemented HTTPS noredir
2015-11-20 17:37:06 -05:00
9dd6ad8503
First try at HTTPS_METHOD
2015-11-20 16:53:50 -05:00
205b391677
Merge pull request #277 from TravisDart/master
...
Typo fix.
2015-10-30 15:11:37 -06:00
8225015c85
Typo fix.
2015-10-30 15:48:01 -05:00
588cdf6266
Update email address
2015-10-29 13:32:09 -06:00
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
5404938797
Update to nginx 1.9.6
2015-10-28 21:29:39 -07:00
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
66d401c075
makefile: update docker images before running tests
2015-10-14 19:42:59 +00:00
1ea74e9b0a
Merge pull request #264 from jwilder/jw-tests
...
Testing fixups
2015-10-14 11:02:33 -06:00
db7a5ab2ae
Use make test from circle.yml
2015-10-14 10:48:43 -06:00
e09550febb
Add Makefile
...
Make it easier to run tests.
2015-10-14 10:29:22 -06:00
1786edd87d
Update .dockerignore to recent file additions
2015-10-14 10:19:50 -06:00
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
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
3e530a0784
Use latest docker-gen
2015-10-13 21:49:19 +02:00
1e0b930174
trim whitespace from host and port
...
based on latest docker-gen
2015-10-13 21:48:59 +02:00
098b058b0d
Trap TERM to allow quicker exit of web containers
2015-10-12 21:53:52 -07:00
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
1d9db94535
Use docker:1.7 image to match CircleCI's version
2015-10-12 21:16:55 -07:00
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
6e7ff3451b
Remove commented out line
2015-10-11 11:27:38 -07:00
ec393e3d18
Pull additional images needed for Circle CI
2015-10-11 11:05:08 -07:00
30e565f0ed
Check "docker version" from a sibling container
2015-10-11 11:04:00 -07:00
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
0d2bc38179
Run curl commands from a sibling container
2015-10-09 23:11:03 -07:00
2cba8a8d5f
Avoid xargs -r
...
The -r option is not available on OS X
2015-10-09 23:10:38 -07:00
