461 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Steve Kamerman	761bbf9dbc	Removed duplicate server_names_hash_bucket_size directive	2017-06-18 21:21:05 -04:00
Jason Wilder	c41186a3a4	Merge branch 'master' into feature_ssl_improvement	2017-06-14 16:31:12 -06:00
Jason Wilder	90b62e0abc	Merge pull request #851 from Neilpang/worker_processes ... fix worker_processes to "auto"	2017-06-12 19:23:29 -06:00
neil	a3cd96ead4	alpine fix worker_processes to "auto"	2017-06-13 09:11:27 +08:00
Jason Wilder	e3b6be79fc	Merge pull request #847 from jwilder/appropriate-trim-earlier ... Trim $host and $proto before they are used	2017-06-12 09:48:27 -06:00
neil	1867228cce	fix worker_processes to "auto"	2017-06-12 15:59:55 +08:00
Jason Wilder	4e4733f68e	Trim $host and $proto before they are used	2017-06-09 12:55:39 -06:00
Jason Wilder	23a2c7d848	Merge pull request #812 from thueske/master ... Upgrade to 1.13.0	2017-05-04 15:39:57 -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
Jason Wilder	965c722344	Merge pull request #810 from rtalvarez/readme-typo ... Fix README typo	2017-05-03 16:57:40 -06:00
Roberto Alvarez	f2487741dc	Fix README typo ... Fixed a small typo/error with "the a" host	2017-05-03 11:06:34 -05:00
Jason Wilder	b6a445b1a9	Merge pull request #790 from versada/fix-typo ... DOC: fixed typo	2017-04-11 10:48:12 -06:00
Naglis Jonaitis	cf88817355	DOC: fixed typo	2017-04-11 11:43:47 +03:00
Jason Wilder	851b0e36cd	Merge pull request #789 from matt-hh/feature/upgrade-1.11.13 ... Upgrade to nginx 1.11.13	2017-04-07 09:38:33 -06:00
Matthias Döring	172d79aff4	Upgrade to nginx 1.11.13	2017-04-07 12:58:49 +02:00
Jason Wilder	619943ac1e	Merge pull request #770 from sischnei/http2-in-readme ... Updated README to include HTTP/2.0	2017-03-18 09:38:16 -06:00
sischnei	6fd32b5a9b	Updated README to include HTTP/2.0	2017-03-18 10:52:43 +01: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
Jason Wilder	82133865d4	Merge pull request #767 from thomasleveil/patch-1 ... DOC: reflect change from PR #344	2017-03-14 18:57:53 -06:00
Thomas LÉVEIL	77e022cf28	DOC: reflect change from PR #344 ... PR #344 changed the HTTP status code from `503` to `500`. The README.md file was not updated accordingly.	2017-03-15 01:32:47 +01:00
Steve Kamerman	6912414750	Merge branch 'master' into feature_ssl_improvement	2017-03-08 11:31:01 -05:00
Steve Kamerman	e373a5199b	Merge branch 'master' into feature_ssl_improvement	2017-03-08 10:49:02 -05:00
Jason Wilder	d5deff21c5	Merge pull request #757 from thomasleveil/issue/755 ... TEST: fix #755: Tests fail with new Docker version scheme	2017-03-07 23:34:45 -07:00
Steve Kamerman	c2544d4c78	Merge pull request #2 from thomasleveil/PR/589 ... TESTS: refactor dhparam tests	2017-03-07 20:51:06 -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
Jason Wilder	6554a1cf28	Merge pull request #732 from matt-hh/feature/upgrade-1.11.10 ... Upgrade to nginx 1.11.10	2017-02-21 10:18:23 -07:00
Matthias Döring	7bafa37a52	Upgrade to nginx 1.11.10	2017-02-21 14:03:54 +01:00
Jason Wilder	9e31d5042f	Merge pull request #735 from thomasleveil/test_events ... TESTS: add a test to verify nginx conf is updated	2017-02-20 22:57:19 -07: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
Jason Wilder	68816390ee	Merge pull request #655 from thomasleveil/pytest ... rewrite tests using docker-compose and pytest	2017-02-18 09:52:38 -07: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
Thomas LEVEIL	250a01d235	TESTS: add tests for IPv6 support	2017-02-16 23:27:28 +01:00
Thomas LEVEIL	78375632dd	TESTS: adjust Travis-CI config (upgrade to docker 1.13 and no more docker-compose)	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	a6e4f7f3ad	TESTS: adjust Travis-CI config	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	02f9e29a31	TESTS: make pytest verbose by default	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	9f26efdf86	TESTS: add tests for IPv6	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	e6b9d2f5e7	TESTS: show skip reason in test summary	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	eeb27f7b50	TESTS: fix failure raising when cannot get nginx-proxy nginx configuration file	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	43d8ba0e78	TESTS: add tests for using nginx and docker-gen in separated containers	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	a533ff6aff	TESTS: add support for resolving containers IP address from domain names in the form *.<container name>.container.docker	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	743d9801e9	TESTS: make test now runs tests from a docker container	2017-02-16 21:40:54 +01:00
Thomas LEVEIL	e6bc7e6043	TESTS: rename nginx-proxy-tester.sh to test.sh	2017-02-16 21:40:54 +01:00