  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 |
|
|
Jason Wilder
|
f819a4e2e7
|
Merge pull request #257 from appropriate/osx-fix-test-suite
Fix running test suite under Docker Machine
|
2015-10-12 22:43:19 -06:00 |
|
|
Jason Wilder
|
df6778f673
|
Merge pull request #256 from thomasleveil/patch-1
fix CircleCI badge link
|
2015-10-09 09:53:38 -06:00 |
|
|
Jason Wilder
|
495b0ad8b6
|
Add circleci build status badge
|
2015-10-08 22:08:04 -06:00 |
|
|
Jason Wilder
|
289a519dce
|
Merge pull request #246 from thomasleveil/fix/197
add test suite. See #197
|
2015-10-08 22:01:15 -06:00 |
|
|
Jason Wilder
|
a81bb961e4
|
Merge pull request #252 from lsde/master
fix condition for default config location
|
2015-10-08 20:53:16 -06:00 |
|
|
Jason Wilder
|
2ffa3a182f
|
Merge pull request #248 from appropriate/missing-access-log
Add missing access_log statement to HTTPS fallback
|
2015-10-07 09:04:13 -06:00 |
|
|
Jason Wilder
|
3f223abeb8
|
Merge pull request #240 from rarous/master
Update to nginx 1.9.5 with HTTP/2 support
|
2015-09-30 12:01:09 -06:00 |
|