1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-02-23 17:28:14 +00:00

Commit Graph

  • 172d79aff4 Upgrade to nginx 1.11.13 Matthias Döring 2017-04-07 12:58:49 +02:00
  • 619943ac1e Merge pull request #770 from sischnei/http2-in-readme 0.6.0 Jason Wilder 2017-03-18 09:38:16 -06:00
  • 6fd32b5a9b Updated README to include HTTP/2.0 sischnei 2017-03-18 10:52:43 +01:00
  • 8414a94d59 TESTS: add test for the case in which a wildcard cert matches a container having nohttps set Thomas LEVEIL 2017-03-15 02:11:21 +01:00
  • 82133865d4 Merge pull request #767 from thomasleveil/patch-1 Jason Wilder 2017-03-14 18:57:53 -06:00
  • 77e022cf28 DOC: reflect change from PR #344 Thomas LÉVEIL 2017-03-15 01:32:47 +01:00
  • de2f057c10 TESTS: add test for unreachable container Thomas LEVEIL 2017-02-21 01:55:52 +01:00
  • 6dfc3f3f70 TESTS: add stress test when a certificate file is missing Thomas LEVEIL 2017-02-21 01:05:42 +01:00
  • e25c78b00a TESTS: add pytest incremental marker to mark tests as expected to fail if previous test failed Thomas LEVEIL 2017-02-21 01:04:50 +01:00
  • a3fbaa5990 TESTS: add directory for tests featuring scenarios trying to make nginx-proxy fail Thomas LEVEIL 2017-02-21 01:01:00 +01:00
  • 6912414750 Merge branch 'master' into feature_ssl_improvement Steve Kamerman 2017-03-08 11:31:01 -05:00
  • e373a5199b Merge branch 'master' into feature_ssl_improvement Steve Kamerman 2017-03-08 10:49:02 -05:00
  • d5deff21c5 Merge pull request #757 from thomasleveil/issue/755 Jason Wilder 2017-03-07 23:34:45 -07:00
  • c2544d4c78 Merge pull request #2 from thomasleveil/PR/589 Steve Kamerman 2017-03-07 20:51:06 -05:00
  • abdd5883a1 TESTS: refactor dhparam tests Thomas LEVEIL 2017-03-08 02:37:12 +01:00
  • 98b5828f83 Modified tests to include dhparams Steve Kamerman 2017-03-07 14:04:44 -05:00
  • 0244b4e71e Added dhparams test in new format Steve Kamerman 2017-03-07 14:04:37 -05:00
  • 99a569b2e6 fix #755: Tests fail with new Docker version scheme Thomas LEVEIL 2017-03-06 23:36:16 +01:00
  • ad9af2884d Merged master, fixed BATS conflict Steve Kamerman 2017-03-06 10:48:12 -05:00
  • 6554a1cf28 Merge pull request #732 from matt-hh/feature/upgrade-1.11.10 Jason Wilder 2017-02-21 10:18:23 -07:00
  • 7bafa37a52 Upgrade to nginx 1.11.10 Matthias Döring 2017-02-19 21:32:22 +01:00
  • 9e31d5042f Merge pull request #735 from thomasleveil/test_events Jason Wilder 2017-02-20 22:57:19 -07:00
  • 2aef648f3d TESTS: add a test to verify nginx conf is update on container creation/deletion Thomas LEVEIL 2017-02-21 03:20:38 +01:00
  • 68816390ee Merge pull request #655 from thomasleveil/pytest Jason Wilder 2017-02-18 09:52:38 -07:00
  • dd443f3eca TESTS: ignore the requirements and certs directory when collecting tests Thomas LEVEIL 2017-02-17 01:24:48 +01:00
  • 9620be91fa TESTS: separated containers: fix indentation and remove dependency over jwilder/whoami image Thomas LEVEIL 2017-02-17 01:09:53 +01:00
  • 85370fa31f TESTS: improve error reporting for failed to run docker-compose commands Thomas LEVEIL 2017-02-14 22:30:20 +01:00
  • 6069bc53cd TESTS: replace old test suite with the new one Thomas LEVEIL 2017-02-17 00:10:21 +01:00
  • 250a01d235 TESTS: add tests for IPv6 support Thomas LEVEIL 2017-02-16 23:27:28 +01:00
  • 78375632dd TESTS: adjust Travis-CI config (upgrade to docker 1.13 and no more docker-compose) Thomas LEVEIL 2017-02-14 03:19:00 +01:00
  • a6e4f7f3ad TESTS: adjust Travis-CI config Thomas LEVEIL 2017-02-14 03:01:50 +01:00
  • 02f9e29a31 TESTS: make pytest verbose by default Thomas LEVEIL 2017-02-14 03:01:35 +01:00
  • 9f26efdf86 TESTS: add tests for IPv6 Thomas LEVEIL 2017-02-14 01:39:08 +01:00
  • e6b9d2f5e7 TESTS: show skip reason in test summary Thomas LEVEIL 2017-02-14 02:19:13 +01:00
  • eeb27f7b50 TESTS: fix failure raising when cannot get nginx-proxy nginx configuration file Thomas LEVEIL 2017-02-14 02:12:22 +01:00
  • 43d8ba0e78 TESTS: add tests for using nginx and docker-gen in separated containers Thomas LEVEIL 2017-02-11 22:42:24 +01:00
  • a533ff6aff TESTS: add support for resolving containers IP address from domain names in the form *.<container name>.container.docker Thomas LEVEIL 2017-02-11 22:41:09 +01:00
  • 743d9801e9 TESTS: make test now runs tests from a docker container Thomas LEVEIL 2017-02-11 03:58:23 +01:00
  • e6bc7e6043 TESTS: rename nginx-proxy-tester.sh to test.sh Thomas LEVEIL 2017-02-11 03:47:31 +01:00
  • 87926db4c3 TESTS: upgrade to docker python module 2.0.2 and docker-compose 1.11.1 Thomas LEVEIL 2017-02-11 03:43:01 +01:00
  • fdde850fc2 TESTS: pytest checks the existance of the jwilder/nginx-proxy:test image Thomas LEVEIL 2017-02-11 02:23:07 +01:00
  • 3e92192dc4 TESTS: add test for multiple networks Thomas LEVEIL 2017-02-11 02:04:40 +01:00
  • 3ecae2f020 TESTS: the docker_compose pytest fixture is now responsible for attaching the container running pytest to all docker networks Thomas LEVEIL 2017-02-11 01:56:23 +01:00
  • dcf8dd4682 TESTS: refactor conftest.py Thomas LEVEIL 2017-02-11 00:51:17 +01:00
  • 3f88ba8903 TESTS: refactor conftest.py Thomas LEVEIL 2017-02-11 00:12:55 +01:00
  • 10cd3e5f81 TESTS: refactor conftest.py Thomas LEVEIL 2017-02-11 00:02:42 +01:00
  • ad57c48465 Fixed HTTPS test Steve Kamerman 2017-01-31 23:57:16 -08:00
  • 912f5615dc Reorganized certs Steve Kamerman 2017-02-01 07:41:12 +00:00
  • 8995ba02ba Fixed assertion bug Steve Kamerman 2017-02-01 07:40:58 +00:00
  • d0e5870060 Added certs, fixed typos Steve Kamerman 2017-02-01 07:09:51 +00:00
  • 65371e513a Renamed wildcard cert and key Steve Kamerman 2017-01-31 22:50:51 -08:00
  • 087592df2c TESTS: simplify nginx-proxy-tester.sh Thomas LEVEIL 2017-01-28 15:10:10 +01:00
  • 9d8f0db268 TESTS: remove containers after each test Thomas LEVEIL 2017-01-28 11:25:54 +01:00
  • 541ce48292 fixup! TESTS: add support for compose syntax v2 Thomas LEVEIL 2017-01-28 11:19:19 +01:00
  • 889dfea4ca TESTS: adjust logging (when using pytest -s) Thomas LEVEIL 2017-01-27 03:31:33 +01:00
  • 150365e784 fixup! TESTS: add test for custom default configuration Thomas LEVEIL 2017-01-27 03:30:50 +01:00
  • 23d361d1da TESTS: reorganize tests into subfolders Thomas LEVEIL 2017-01-27 02:52:17 +01:00
  • eeed150858 README: fix instruction for overriding default custom conf Thomas LEVEIL 2017-01-27 02:34:46 +01:00
  • 8aa3158952 TESTS: add test for custom default location configuration Thomas LEVEIL 2017-01-27 02:34:11 +01:00
  • 713149df8e TESTS: add test for custom default configuration Thomas LEVEIL 2017-01-27 02:24:46 +01:00
  • ee5b0f96ad TESTS: add test for custom per vhost configuration in location block Thomas LEVEIL 2017-01-27 02:08:35 +01:00
  • a283c95e2e TESTS: nginxproxy fixture can provide the nginx generated conf in tests Thomas LEVEIL 2017-01-27 02:07:56 +01:00
  • f512a56faf TESTS: add test for custom per vhost configuration Thomas LEVEIL 2017-01-27 02:01:57 +01:00
  • 2425574958 TESTS: add test for custom proxy-wide configuration Thomas LEVEIL 2017-01-27 01:55:46 +01:00
  • 73fda600b3 TESTS: add verbosity Thomas LEVEIL 2017-01-27 03:48:06 +01:00
  • 0d00bd2322 TESTS: fix passing pytests args to nginx-proxy-tester script Thomas LEVEIL 2017-01-27 03:45:47 +01:00
  • 399e19e2dc TESTS: add support for compose syntax v2 Thomas LEVEIL 2017-01-26 01:30:17 +01:00
  • 787fa28799 TESTS: add script to run the test suite from a docker container Thomas LEVEIL 2017-01-24 22:42:13 +01:00
  • 7a4cae050c TESTS: abort test suite if the 'jwilder/nginx-proxy:test' image is missing Thomas LEVEIL 2017-01-25 01:11:36 +01:00
  • 86be8a9424 TESTS: fix retry delay Thomas LEVEIL 2017-01-24 22:47:37 +01:00
  • 0f1bb344ff TESTS: port tests for #590 to docker-compose test Thomas LEVEIL 2017-01-14 12:30:48 +01:00
  • 197d793a25 TESTS: rewrite tests using pytest and docker-compose Thomas LEVEIL 2016-12-10 00:53:23 +01:00
  • 985c46d8b5 Merge pull request #679 from thomasleveil/issue-677 Jason Wilder 2017-02-16 12:11:06 -07:00
  • 2d588871f0 Merge pull request #719 from thomasleveil/optional_IPv6 Jason Wilder 2017-02-16 12:09:30 -07:00
  • c5c6a6149d Merge pull request #724 from rindek/master Jason Wilder 2017-02-16 09:42:22 -07:00
  • d7a2aa7823 Merge pull request #676 from matt-hh/feature/alpine-readme Jason Wilder 2017-02-16 09:40:12 -07:00
  • 0e94e1e4bd First load docker-gen, then nginx Jacek Jakubik 2017-02-16 10:47:38 +01:00
  • f0951df040 optional IPv6 support Thomas LEVEIL 2017-02-14 22:48:29 +01:00
  • c0f60087c3 Merge pull request #713 from schrieveslaach/master Jason Wilder 2017-02-13 09:25:33 -07:00
  • 8b67b2182f Add IPv6 listen address Marc Schreiber 2017-02-11 13:28:34 +01:00
  • b9e2053c38 Merge pull request #704 from yosmanyga/patch-1 Jason Wilder 2017-02-06 12:43:16 -07:00
  • cdb38d06ba Merge pull request #706 from matt-hh/feature/upgrade-1.11.9 Jason Wilder 2017-02-06 12:38:41 -07:00
  • 15cbb5debf Upgrade to nginx 1.11.9 Matthias Döring 2017-02-05 21:40:29 +01:00
  • d8f66e2411 Fixed typo Yosmany Garcia 2017-02-03 16:19:40 -08:00
  • c0a0300f12 Merge pull request #696 from kevindoveton/master Jason Wilder 2017-01-26 23:20:40 -07:00
  • 4c06935b62 Update README.md Kevin Doveton 2017-01-27 13:24:24 +10:30
  • 2be48ec982 Update EXPOSE link in README.md Kevin Doveton 2017-01-27 13:16:27 +10:30
  • d320b43476 Merged conflict in BATS SSL test Steve Kamerman 2017-01-26 13:46:11 -05:00
  • 3f6381d0fa regexp: use sha1 for upstream only if regexp is used Thomas LEVEIL 2017-01-14 11:40:33 +01:00
  • 2c5d4ee3a9 Merge pull request #590 from kamermans/feature_nohttps Jason Wilder 2017-01-13 16:16:16 -07:00
  • 276b4dbe3e Merge branch 'master' into feature_nohttps Steve Kamerman 2017-01-13 13:07:03 -05:00
  • 83a28f47d7 Fixed long server name comment, improved dhparam check Steve Kamerman 2017-01-12 17:43:13 -05:00
  • b0de1f19d3 Updated to use 256-bit dhparam in tests Steve Kamerman 2017-01-12 17:25:31 -05:00
  • 7d253dd0f3 Allow passing DHPARAM_BITS via env, lower bits to 256 for unit tests Steve Kamerman 2017-01-12 14:55:25 -05:00
  • dffc0c47cf Tweak test for reliability on Travis-CI Steve Kamerman 2017-01-12 10:52:56 -05:00
  • c219822cd8 Typos Steve Kamerman 2017-01-12 01:53:36 -05:00
  • f73a52afaf Added BATS tests for dhparam generation Steve Kamerman 2017-01-12 01:45:46 -05:00
  • 7c0f7b9449 Fixed Alpine image, removed dhparams gen from test units Steve Kamerman 2017-01-12 00:21:39 -05:00
  • 6242403d33 Added dhparam support for alpine variant Steve Kamerman 2017-01-11 23:04:24 -05:00
  • ebfe5e9c17 Added note about background generation Steve Kamerman 2017-01-11 22:49:55 -05:00