  Jason WilderandGitHub
|
c33dedf10b
|
Merge pull request #1193 from gpkfr/master
Upgrade to nginx 1.14.1 stable version
|
2018-11-09 09:50:28 -07:00 |
|
|
Jason WilderandGitHub
|
e80fc0b304
|
Merge pull request #1140 from matt-hh/feature/upgrade-1.14
Upgrade to nginx 1.14 stable version
|
2018-08-17 10:20:50 -06:00 |
|
|
Jason WilderandGitHub
|
a285717657
|
Merge pull request #1123 from kamermans/feature/tls1.3
Add TLSv1.3 support
|
2018-06-07 15:56:19 -06:00 |
|
|
Jason WilderandGitHub
|
9521593cbc
|
Merge pull request #1124 from kamermans/bugfix/travis-ci-errors-fix2
Bugfix: Test reads from out-of-scope var
|
2018-04-22 15:47:42 -06:00 |
|
|
Jason WilderandGitHub
|
ccbbbeb928
|
Merge pull request #1073 from b1f6c1c4/b1f6c1c4-patch-1
Add HSTS header regardless of status code
|
2018-03-30 17:34:02 -04:00 |
|
|
Jason WilderandGitHub
|
556b3364fb
|
Merge pull request #1115 from kamermans/docs/ocsp-stapling-info
Added docs on enabling OCSP Stapling
|
2018-03-28 20:50:15 -04:00 |
|
|
Jason WilderandGitHub
|
71225a28fa
|
Merge pull request #1026 from jwilder/updates
Updates for 0.7.0 release
|
2018-03-23 23:34:31 -06:00 |
|
|
Jason WilderandGitHub
|
1f19ee3c56
|
Merge pull request #1088 from matt-hh/fix-1076
Enable NETWORK_ACCESS feature for alpine version
|
2018-03-23 14:54:52 -06:00 |
|
|
Jason WilderandGitHub
|
6290f38069
|
Merge pull request #1106 from hwellmann/master
do not create an empty upstream entry for invisible containers
|
2018-03-23 12:14:37 -06:00 |
|
|
Jason WilderandGitHub
|
1dce981707
|
Merge pull request #984 from sydoveton/master
OCSP Stapling was not working
|
2018-03-23 08:57:27 -06:00 |
|
|
Jason WilderandGitHub
|
000a44772d
|
Merge pull request #1090 from sergeifilippov/patch-1
Grammar Police
|
2018-03-08 15:01:00 -07:00 |
|
|
Jason WilderandGitHub
|
d6042d08f1
|
Merge pull request #734 from thomasleveil/knwon_issues
TESTS: add tests for known issues
|
2018-02-20 14:50:11 -07:00 |
|
|
Jason WilderandGitHub
|
226bfe158f
|
Merge pull request #926 from Paike/patch-1
Fallback if container has no IP
|
2018-01-20 23:04:40 -07:00 |
|
|
Jason WilderandGitHub
|
3fab237f34
|
Merge pull request #1022 from mouhamed/patch-1
Remove duplicate
|
2018-01-09 21:29:06 -07:00 |
|
|
Jason WilderandGitHub
|
73f29846b3
|
Merge pull request #957 from buchdag/ssl-modern
Allow optional use of Mozilla modern SSL configuration
|
2017-12-06 16:34:30 -07:00 |
|
|
Jason WilderandGitHub
|
a6e8fae7f5
|
Merge pull request #970 from kamermans/bugfix/failing_ssl_tests
Fixed failing SSL tests
|
2017-11-09 10:04:20 -07:00 |
|
|
Jason WilderandGitHub
|
9b8323d2e2
|
Merge pull request #969 from kamermans/feature/custom_hsts
Added custom HSTS support (issue #953)
|
2017-11-09 08:47:37 -07:00 |
|
|
Jason WilderandGitHub
|
1374ee5b9e
|
Merge pull request #962 from cglewis/master
MAINTAINER is deprecated, using LABEL now
|
2017-11-06 11:07:26 -07:00 |
|
|
Jason WilderandGitHub
|
1b868259fe
|
Merge pull request #955 from buchdag/dhparam-separate-container
Fix default dhparam.pem when using separate containers
|
2017-10-26 10:09:18 -06:00 |
|
|
Jason WilderandGitHub
|
3ef600a3b5
|
Merge pull request #842 from kamermans/feature/external_internal_network
Allow containers to be restricted to internal network
|
2017-10-20 10:04:08 -06:00 |
|
|
Jason WilderandGitHub
|
fc36514eb8
|
Merge pull request #863 from qiqizjl/master
support fastcgi
|
2017-10-20 10:00:27 -06:00 |
|
|
Jason WilderandGitHub
|
795e153c2e
|
Merge pull request #951 from kamermans/bugfix/ipv6_resolvers
Added support for IPv6 DNS servers in resolver generation (issue #938)
|
2017-10-20 09:50:56 -06:00 |
|
|
Jason WilderandGitHub
|
f05f7a0ff9
|
Merge pull request #574 from teohhanhui/ocsp-stapling-chain
Enable OCSP stapling if certificate trust chain is provided
|
2017-08-16 11:53:17 -06:00 |
|
|
Jason WilderandGitHub
|
817db85aae
|
Merge pull request #898 from remipichon/master
Do not bind upstream with 'ingress' network
|
2017-08-16 10:12:18 -06:00 |
|
|
Jason WilderandGitHub
|
df24d9dff5
|
Merge pull request #901 from brikou/patch-2
Simplify docker-compose.yml example
|
2017-08-13 15:57:09 -06:00 |
|
|
Jason WilderandGitHub
|
6bdd184d6a
|
Merge pull request #882 from matt-hh/feature/auto-update-from-upstream-nginx
Move to 1.13 base image to get auto updates
|
2017-07-21 08:53:48 -06:00 |
|
|
Jason WilderandGitHub
|
02121df3b9
|
Merge pull request #589 from kamermans/feature_ssl_improvement
SSL security enhancement
|
2017-06-22 11:54:51 -06:00 |
|
|
Jason WilderandGitHub
|
14779ec4be
|
Merge pull request #860 from jwilder/jw-travis
Update docker
|
2017-06-22 11:46:48 -06:00 |
|
|
Jason WilderandGitHub
|
57a33aaf8b
|
Merge pull request #849 from Neilpang/Branch_0.6.0
running proxy on host network
|
2017-06-22 09:50:39 -06:00 |
|
|
Jason WilderandGitHub
|
c41186a3a4
|
Merge branch 'master' into feature_ssl_improvement
|
2017-06-14 16:31:12 -06:00 |
|
|
Jason WilderandGitHub
|
90b62e0abc
|
Merge pull request #851 from Neilpang/worker_processes
fix worker_processes to "auto"
|
2017-06-12 19:23:29 -06:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
23a2c7d848
|
Merge pull request #812 from thueske/master
Upgrade to 1.13.0
|
2017-05-04 15:39:57 -06:00 |
|
|
Jason WilderandGitHub
|
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 WilderandGitHub
|
965c722344
|
Merge pull request #810 from rtalvarez/readme-typo
Fix README typo
|
2017-05-03 16:57:40 -06:00 |
|
|
Jason WilderandGitHub
|
b6a445b1a9
|
Merge pull request #790 from versada/fix-typo
DOC: fixed typo
|
2017-04-11 10:48:12 -06:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
82133865d4
|
Merge pull request #767 from thomasleveil/patch-1
DOC: reflect change from PR #344
|
2017-03-14 18:57:53 -06:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
68816390ee
|
Merge pull request #655 from thomasleveil/pytest
rewrite tests using docker-compose and pytest
|
2017-02-18 09:52:38 -07:00 |
|
|
Jason WilderandGitHub
|
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 WilderandGitHub
|
2d588871f0
|
Merge pull request #719 from thomasleveil/optional_IPv6
optional IPv6 support
|
2017-02-16 12:09:30 -07:00 |
|
|
Jason WilderandGitHub
|
c5c6a6149d
|
Merge pull request #724 from rindek/master
First load docker-gen, then nginx
|
2017-02-16 09:42:22 -07:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
c0f60087c3
|
Merge pull request #713 from schrieveslaach/master
Add IPv6 listen address
|
2017-02-13 09:25:33 -07:00 |
|
|
Jason WilderandGitHub
|
b9e2053c38
|
Merge pull request #704 from yosmanyga/patch-1
Fixed typo
|
2017-02-06 12:43:16 -07:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
c0a0300f12
|
Merge pull request #696 from kevindoveton/master
Update EXPOSE link in README.md
|
2017-01-26 23:20:40 -07:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
3d20c626c8
|
Merge pull request #359 from sw-double/master
Set appropriate X-Forwarded-Ssl header
|
2017-01-10 09:21:19 -07:00 |
|
|
Jason WilderandGitHub
|
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 |
|
|
Jason WilderandGitHub
|
f837d1256a
|
Merge pull request #670 from thomasleveil/parallel-tests
TRAVIS: run debian and alpine tests in parallel
|
2017-01-07 14:04:40 -07:00 |
|
|
Jason WilderandGitHub
|
31a0a844e3
|
Merge pull request #558 from matt-hh/alpine
Add alpine base image
|
2017-01-05 18:05:38 -07:00 |
|
|
Jason WilderandGitHub
|
e9a5519fb0
|
Merge pull request #611 from MichaelSp/patch-1
add link to letsencrypt-nginx-proxy-companion
|
2016-12-30 15:26:40 -07:00 |
|
|
Jason WilderandGitHub
|
a7bc426b61
|
Merge pull request #666 from matt-hh/feature/upgrade-1.11.8
Upgrade to nginx 1.11.8
|
2016-12-28 18:42:02 -07:00 |
|
|
Jason WilderandGitHub
|
6186fbf8b0
|
Merge pull request #653 from cramaker/feature/nginx-1.11.6
Updated nginx to 1.11.6
|
2016-12-08 12:59:56 -07:00 |
|
|
Jason WilderandGitHub
|
40872c9b43
|
Merge pull request #649 from kamermans/travisci_fix
Travis-CI - upgrade docker-engine and allow downgrades
|
2016-12-05 10:10:27 -07:00 |
|
|
Jason WilderandGitHub
|
e60fefad27
|
Merge pull request #587 from kamermans/feature_x_forwarded_port
Added X-Forwarded-Port and proxy headers tests
|
2016-12-02 11:17:44 -07:00 |
|
|
Jason WilderandGitHub
|
51aeee9a2c
|
Merge pull request #619 from max-wilkinson/master
Clarified a couple parts in the README
|
2016-11-27 13:19:34 -07:00 |
|
|
Jason WilderandGitHub
|
0670a13d92
|
Merge pull request #581 from chulkilee/ssl_session_tickets
add ssl_session_tickets to default site
|
2016-09-24 20:22:16 -06:00 |
|
|
Jason WilderandGitHub
|
760936d9ea
|
Merge pull request #572 from pvlg/patch-2
Replace "replace" to "trimSuffix"
|
2016-09-17 09:58:27 -06:00 |
|
|
Jason WilderandGitHub
|
f02bc98a6e
|
Merge pull request #566 from mplx/patch/hsts-no-subdomains
do not enable HSTS for subdomains
|
2016-09-13 09:18:27 -06:00 |
|
|
Jason WilderandGitHub
|
40d433ae80
|
Merge pull request #493 from ryneeverett/docker_compose_separate_containers
Add docker-compose file for separate containers.
|
2016-09-09 14:18:06 -06:00 |
|
|
Jason WilderandGitHub
|
ec7169c112
|
Merge pull request #323 from pabra/master
connect to uWSGI backends
|
2016-09-09 14:16:08 -06:00 |
|
|
Jason WilderandGitHub
|
e95d3e9fdf
|
Merge pull request #555 from freakinruben/patch-1
Update ciphers and HTST settings to get A+ rating
|
2016-09-01 09:21:56 -06:00 |
|
|
Jason WilderandGitHub
|
579bc1bf6e
|
Merge pull request #518 from huiwang/nginx_upgrade
upgrade nginx to 1.11.3
|
2016-08-25 20:55:54 -06:00 |
|
|
Jason WilderandGitHub
|
a6287d7df1
|
Merge pull request #545 from auchri/patch-1
Update .travis.yml
|
2016-08-25 12:30:16 -06:00 |
|
|
Jason WilderandGitHub
|
30128cfda0
|
Merge pull request #511 from kamermans/master
Mitigate httpoxy attack by suppressing `Proxy` request header
|
2016-07-19 12:15:35 -06:00 |
|
|
Jason WilderandGitHub
|
a2ab8363ca
|
Merge pull request #483 from jwilder/jw-docker-gen
Update to docker-gen 0.7.3
|
2016-06-13 08:18:07 -06:00 |
|
|
Jason WilderandGitHub
|
db3ef67a7f
|
Merge pull request #482 from jwilder/jw-revert
Revert 9c93efa
|
2016-06-13 00:21:38 -06:00 |
|
|
Jason WilderandGitHub
|
d1e6e1c0be
|
Merge pull request #344 from schmunk42/feature/error-code
changed error code for non-usable/default SSL cert, fixes #341
|
2016-06-12 15:54:40 -06:00 |
|
|
Jason WilderandGitHub
|
fc619d63ad
|
Merge pull request #460 from kumy/patch-1
Fix a typo in comment
|
2016-06-12 15:28:40 -06:00 |
|
|
Jason WilderandGitHub
|
c36b42933d
|
Merge pull request #462 from kamermans/master
Disable HSTS when HTTPS_METHOD=noredirect
|
2016-06-12 15:28:08 -06:00 |
|
|
Jason WilderandGitHub
|
a0dee5c833
|
Remove -only-exposed from separate container instructions
|
2016-06-12 15:25:32 -06:00 |
|
|
Jason WilderandGitHub
|
fdfb0becd2
|
Merge pull request #480 from jwilder/jw-certs
Fix template error when /etc/nginx/certs does not exist
|
2016-06-12 14:28:35 -06:00 |
|
|
Jason WilderandGitHub
|
adf4573de4
|
Remove Circle CI badge
|
2016-06-12 10:45:59 -06:00 |
|
|
Jason WilderandGitHub
|
8393a57f1f
|
Merge pull request #477 from jwilder/jw-nginx
Nginx updates
|
2016-06-10 20:22:07 -06:00 |
|
|
Jason Wilder
|
0ef8dca98c
|
Merge pull request #443 from jwilder/jw-circle
Remove circle.yml
|
2016-05-04 16:52:41 -06:00 |
|
|
Jason Wilder
|
c30640b024
|
Remove circle.yml
Using travis now
|
2016-05-04 16:05:03 -06:00 |
|
|
Jason Wilder
|
e964b9d29f
|
Merge pull request #441 from jwilder/jw-0.7.1
Update to docker-gen 0.7.1
|
2016-05-04 16:03:52 -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 |
|
|
Jason Wilder
|
1c98df2de4
|
Merge pull request #337 from baptistedonaux/master
Support Overlay Network
|
2016-05-01 17:35:48 -06:00 |
|
|
Jason Wilder
|
a72c7e6e20
|
Add docker hub badges
|
2016-04-22 09:56:21 -06:00 |
|
|
Jason Wilder
|
48c31836be
|
Merge pull request #407 from jwilder/jw-travis
Add travis.yml
|
2016-04-04 17:27:12 -06:00 |
|
|
Jason Wilder
|
59f8d4301a
|
Merge pull request #406 from jwilder/jw-forego
Switch forego downloads
|
2016-04-04 16:56:49 -06:00 |
|
|
Jason Wilder
|
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 |
|
|
Jason Wilder
|
f2966c5db1
|
Merge pull request #374 from mrohland/master
updated to nginx 1.9.12
|
2016-03-21 16:28:18 -06:00 |
|
|
Jason Wilder
|
87d0c68aac
|
Merge pull request #371 from gabriel403/patch-1
Mention the docker-compose networking issues
|
2016-03-03 15:35:43 -07:00 |
|
|
Jason Wilder
|
2b24c1712a
|
Merge pull request #342 from schmunk42/feature/updated-nginx
updated nginx to 1.9.9
|
2016-02-14 16:20:48 -07:00 |
|
|
Jason Wilder
|
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 |
|
|
Jason Wilder
|
205b391677
|
Merge pull request #277 from TravisDart/master
Typo fix.
|
2015-10-30 15:11:37 -06:00 |
|
|
Jason Wilder
|
588cdf6266
|
Update email address
|
2015-10-29 13:32:09 -06:00 |
|
|
Jason Wilder
|
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 |
|
|
Jason Wilder
|
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 |
|
|
Jason Wilder
|
1ea74e9b0a
|
Merge pull request #264 from jwilder/jw-tests
Testing fixups
|
2015-10-14 11:02:33 -06:00 |
|
|
Jason Wilder
|
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 |
|
|
Jason Wilder
|
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 |
|