Matthias Döring
febf85d7e2
Move to 1.13 base image to get auto updates
...
Less maintenance and more security
Resolves #880
2017-07-21 13:45:33 +02:00
Jason Wilder
c41186a3a4
Merge branch 'master' into feature_ssl_improvement
2017-06-14 16:31:12 -06:00
Tobias Hüske
2c4102d396
Upgrade to 1.13.0
2017-05-04 18:57:00 +02:00
Jason Wilder
fed6df3756
Merge pull request #768 from thomasleveil/wildcard_cert_nohttps
...
TESTS: add test for wildcard cert + nohttps + default.crt
2017-05-03 17:02:40 -06:00
Matthias Döring
172d79aff4
Upgrade to nginx 1.11.13
2017-04-07 12:58:49 +02:00
Thomas LEVEIL
8414a94d59
TESTS: add test for the case in which a wildcard cert matches a container having nohttps set
2017-03-15 02:12:07 +01:00
Steve Kamerman
e373a5199b
Merge branch 'master' into feature_ssl_improvement
2017-03-08 10:49:02 -05:00
Thomas LEVEIL
abdd5883a1
TESTS: refactor dhparam tests
2017-03-08 02:37:12 +01:00
Steve Kamerman
98b5828f83
Modified tests to include dhparams
2017-03-07 14:04:44 -05:00
Steve Kamerman
0244b4e71e
Added dhparams test in new format
2017-03-07 14:04:37 -05:00
Thomas LEVEIL
99a569b2e6
fix #755 : Tests fail with new Docker version scheme
...
Docker introduced a [new version scheme](https://blog.docker.com/2017/03/docker-enterprise-edition/ ). As the result, the latest docker version is now `17.03.0-ce`.
2017-03-06 23:36:16 +01:00
Steve Kamerman
ad9af2884d
Merged master, fixed BATS conflict
2017-03-06 10:48:12 -05:00
Thomas LEVEIL
2aef648f3d
TESTS: add a test to verify nginx conf is update on container creation/deletion
2017-02-21 03:20:38 +01:00
Thomas LEVEIL
dd443f3eca
TESTS: ignore the requirements and certs directory when collecting tests
2017-02-17 01:24:48 +01:00
Thomas LEVEIL
9620be91fa
TESTS: separated containers: fix indentation and remove dependency over jwilder/whoami image
2017-02-17 01:11:11 +01:00
Thomas LEVEIL
85370fa31f
TESTS: improve error reporting for failed to run docker-compose commands
2017-02-17 00:54:14 +01:00
Thomas LEVEIL
6069bc53cd
TESTS: replace old test suite with the new one
...
get rid of Bats definitively
2017-02-17 00:29:30 +01:00
Steve Kamerman
d320b43476
Merged conflict in BATS SSL test
2017-01-26 13:46:11 -05:00
Steve Kamerman
276b4dbe3e
Merge branch 'master' into feature_nohttps
2017-01-13 13:07:03 -05:00
Steve Kamerman
83a28f47d7
Fixed long server name comment, improved dhparam check
2017-01-12 17:43:13 -05:00
Steve Kamerman
b0de1f19d3
Updated to use 256-bit dhparam in tests
2017-01-12 17:25:31 -05:00
Steve Kamerman
7d253dd0f3
Allow passing DHPARAM_BITS via env, lower bits to 256 for unit tests
2017-01-12 14:55:25 -05:00
Steve Kamerman
dffc0c47cf
Tweak test for reliability on Travis-CI
2017-01-12 10:52:56 -05:00
Steve Kamerman
c219822cd8
Typos
2017-01-12 01:53:36 -05:00
Steve Kamerman
f73a52afaf
Added BATS tests for dhparam generation
2017-01-12 01:45:46 -05:00
Steve Kamerman
7c0f7b9449
Fixed Alpine image, removed dhparams gen from test units
2017-01-12 00:21:39 -05:00
Thomas LEVEIL
d8658bd8d9
TEST: wildcards-hosts.bats - add a test which uses regexp end-of-string
2017-01-07 23:50:54 +01:00
Thomas LEVEIL
a3c6a272f1
TEST: wildcards-hosts.bats - showcase http://foo.bar.why.not.bats-to-infinity-and-beyond/
2017-01-07 23:33:54 +01:00
Steve Kamerman
fc7653bf3d
Merge branch 'master' into feature_nohttps
2016-12-05 09:06:39 -05:00
Steve Kamerman
374b1256cd
Add HTTPS_METHOD=https to disable SSL site
2016-10-01 11:22:48 -04:00
Steve Kamerman
b9bf183df2
Added httpoxy test
2016-09-29 15:43:07 -04:00
Steve Kamerman
112aad39b6
Implemented more advanced webserver with routing and request header echoing, added header tests
2016-09-29 15:36:01 -04:00
Jason Wilder
8ed5ab38b8
Update to docker-gen 0.7.3
2016-06-13 00:24:21 -06:00
Steve Kamerman
da3e257843
Removed HSTS when HTTPS_METHOD=noredirect, added tests, improved docs wrt HSTS
2016-05-19 23:20:43 -04:00
Jason Wilder
d40d1d4052
Update to docker-gen 0.7.1
2016-05-04 14:51:30 -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
Steve Kamerman
786a2375aa
Using different path method to hopefully fix cert volume issue in CI systems
2016-04-20 12:47:14 -04:00
Steve Kamerman
f296b273ce
Normalized indentation, added explicit CERT_NAME
2016-04-20 12:33:21 -04:00
Steve Kamerman
1d0a5d9194
Added SSL/HTTPS tests
2016-04-20 12:20:08 -04:00
Baptiste Donaux
6928d62e1e
Upgrade Docker dependency from 1.9 to 1.10
2016-03-24 14:40:50 +01:00
Baptiste Donaux
88cc096aaf
[FIX] expose port for separated containers test
2016-03-24 11:16:22 +01:00
Baptiste Donaux
6b88365465
Merge remote-tracking branch 'upstream/master'
2016-03-24 08:41:23 +01:00
Pit Kleyersburg
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
Baptiste Donaux
b42cd85570
Unit test - removed network creation
2016-02-26 09:12:11 +01:00
Baptiste Donaux
2b418319f2
Test to support overlay networks
2016-02-25 09:58:17 +01:00
Thomas LEVEIL
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
Mike Dillon
098b058b0d
Trap TERM to allow quicker exit of web containers
2015-10-12 21:53:52 -07: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
