Steve Kamerman
|
912f5615dc
|
Reorganized certs
|
2017-02-16 21:40:54 +01:00 |
|
Steve Kamerman
|
8995ba02ba
|
Fixed assertion bug
|
2017-02-16 21:40:54 +01:00 |
|
Steve Kamerman
|
d0e5870060
|
Added certs, fixed typos
|
2017-02-16 21:40:54 +01:00 |
|
Steve Kamerman
|
65371e513a
|
Renamed wildcard cert and key
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
087592df2c
|
TESTS: simplify nginx-proxy-tester.sh
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
9d8f0db268
|
TESTS: remove containers after each test
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
541ce48292
|
fixup! TESTS: add support for compose syntax v2
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
889dfea4ca
|
TESTS: adjust logging (when using pytest -s)
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
150365e784
|
fixup! TESTS: add test for custom default configuration
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
23d361d1da
|
TESTS: reorganize tests into subfolders
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
eeed150858
|
README: fix instruction for overriding default custom conf
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
8aa3158952
|
TESTS: add test for custom default location configuration
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
713149df8e
|
TESTS: add test for custom default configuration
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
ee5b0f96ad
|
TESTS: add test for custom per vhost configuration in location block
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
a283c95e2e
|
TESTS: nginxproxy fixture can provide the nginx generated conf in tests
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
f512a56faf
|
TESTS: add test for custom per vhost configuration
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
2425574958
|
TESTS: add test for custom proxy-wide configuration
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
73fda600b3
|
TESTS: add verbosity
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
0d00bd2322
|
TESTS: fix passing pytests args to nginx-proxy-tester script
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
399e19e2dc
|
TESTS: add support for compose syntax v2
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
787fa28799
|
TESTS: add script to run the test suite from a docker container
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
7a4cae050c
|
TESTS: abort test suite if the 'jwilder/nginx-proxy:test' image is missing
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
86be8a9424
|
TESTS: fix retry delay
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
0f1bb344ff
|
TESTS: port tests for #590 to docker-compose test
|
2017-02-16 21:40:54 +01:00 |
|
Thomas LEVEIL
|
197d793a25
|
TESTS: rewrite tests using pytest and docker-compose
Experimentation to see if it is worth the effort
|
2017-02-16 21:40:54 +01:00 |
|
Jason Wilder
|
985c46d8b5
|
Merge pull request #679 from thomasleveil/issue-677
regexp: use sha1 for upstream only if regexp is used
|
2017-02-16 12:11:06 -07:00 |
|
Jason Wilder
|
2d588871f0
|
Merge pull request #719 from thomasleveil/optional_IPv6
optional IPv6 support
|
2017-02-16 12:09:30 -07:00 |
|
Jason Wilder
|
c5c6a6149d
|
Merge pull request #724 from rindek/master
First load docker-gen, then nginx
|
2017-02-16 09:42:22 -07:00 |
|
Jason Wilder
|
d7a2aa7823
|
Merge pull request #676 from matt-hh/feature/alpine-readme
Add info about alpine base image
|
2017-02-16 09:40:12 -07:00 |
|
Jacek Jakubik
|
0e94e1e4bd
|
First load docker-gen, then nginx
|
2017-02-16 10:47:38 +01:00 |
|
Thomas LEVEIL
|
f0951df040
|
optional IPv6 support
Fix #127 and fix #717 by improving #713
|
2017-02-15 11:50:16 +01:00 |
|
Jason Wilder
|
c0f60087c3
|
Merge pull request #713 from schrieveslaach/master
Add IPv6 listen address
|
2017-02-13 09:25:33 -07:00 |
|
Marc Schreiber
|
8b67b2182f
|
Add IPv6 listen address
|
2017-02-11 13:28:34 +01:00 |
|
Jason Wilder
|
b9e2053c38
|
Merge pull request #704 from yosmanyga/patch-1
Fixed typo
|
2017-02-06 12:43:16 -07:00 |
|
Jason Wilder
|
cdb38d06ba
|
Merge pull request #706 from matt-hh/feature/upgrade-1.11.9
Upgrade to nginx 1.11.9
|
2017-02-06 12:38:41 -07:00 |
|
Matthias Döring
|
15cbb5debf
|
Upgrade to nginx 1.11.9
|
2017-02-05 21:40:29 +01:00 |
|
Yosmany Garcia
|
d8f66e2411
|
Fixed typo
|
2017-02-03 16:19:40 -08:00 |
|
Jason Wilder
|
c0a0300f12
|
Merge pull request #696 from kevindoveton/master
Update EXPOSE link in README.md
|
2017-01-26 23:20:40 -07:00 |
|
Kevin Doveton
|
4c06935b62
|
Update README.md
|
2017-01-27 13:24:24 +10:30 |
|
Kevin Doveton
|
2be48ec982
|
Update EXPOSE link in README.md
|
2017-01-27 13:16:27 +10:30 |
|
Thomas LEVEIL
|
3f6381d0fa
|
regexp: use sha1 for upstream only if regexp is used
avoid confusions such as in #677
|
2017-01-14 11:40:33 +01:00 |
|
Jason Wilder
|
2c5d4ee3a9
|
Merge pull request #590 from kamermans/feature_nohttps
Added HTTPS_METHOD=nohttps to disable SSL site
|
2017-01-13 16:16:16 -07:00 |
|
Steve Kamerman
|
276b4dbe3e
|
Merge branch 'master' into feature_nohttps
|
2017-01-13 13:07:03 -05:00 |
|
Matthias Döring
|
8dfe5ae384
|
Add info about alpine base image
For todo in #558
|
2017-01-11 16:57:37 +01:00 |
|
Jason Wilder
|
3d20c626c8
|
Merge pull request #359 from sw-double/master
Set appropriate X-Forwarded-Ssl header
|
2017-01-10 09:21:19 -07:00 |
|
Jason Wilder
|
f1ccde2fe3
|
Merge pull request #671 from thomasleveil/regex-end-of-line
fix crash when using end-of-string symbol `$` in regex VIRTUAL_HOST
|
2017-01-10 09:20:28 -07:00 |
|
Konstantin L
|
16c9853dc2
|
Set appropriate X-Forwarded-Ssl header.
|
2017-01-10 15:44:02 +01:00 |
|
Thomas LÉVEIL
|
019fa89c53
|
add comment to ease debugging
|
2017-01-10 10:10:46 +01:00 |
|
Thomas LEVEIL
|
1bfc1c85ce
|
fix regexp in VIRTUAL_HOST using end-of-string matching ()
|
2017-01-08 01:49:05 +01: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 |
|