Commit graph

864 commits

Author SHA1 Message Date
Robin Windey
e014a94d5c
Make merge PR
Make merge PR for not having diff between fork and upstream
2020-10-10 11:28:46 +02:00
Robin Windey
53c9efb197
Ignore fail 2020-10-10 11:27:48 +02:00
Robin Windey
9308b871b4
Merge pull request #7 from nginx-proxy/master
Sync manually from fork upstream
2020-10-10 10:43:59 +02:00
github-actions[bot]
0c62a5a432
Upgrade Nginx to 1.19.3 (#6)
Co-authored-by: lemker <lehelmk@gmail.com>
Co-authored-by: Jason Wilder <jwilder@users.noreply.github.com>
2020-10-10 10:36:51 +02:00
Robin Windey
503e9509a9
Merge branch 'master' of https://github.com/seitenwerke/seitenwerke-nginx-proxy 2020-10-10 10:32:26 +02:00
Robin Windey
da1f77b27b
Sync fork squash 2020-10-10 10:32:20 +02:00
Robin Windey
855a74ced1
Update README.md 2020-10-10 10:10:59 +02:00
Robin Windey
e779f8701c
Update sync-fork version 2020-10-10 10:04:57 +02:00
Robin Windey
fd6f6e2659
docker hub push (#3)
* Docker push action; sync forc manually

* Run on push

* Update README badges

* Remove test
2020-10-10 09:59:30 +02:00
Robin Windey
9ee3d311da
Redirect www to non-www (#1)
* www to non-www redirect + tests

* Github actions fix syntax

* Github actions TTY problem

* Fix docker version github actions

* Revert "Fix docker version github actions"

This reverts commit c5f703a9531058aa61120329ea1daeaccd6269e1.

* Docker version set explicitly
2020-10-10 09:27:49 +02:00
Robin Windey
427443c654
Autosync with upstream via Github Actions (#2) 2020-10-10 09:19:36 +02:00
Jason Wilder
20cc3527b4
Merge pull request #1508 from lemker/master
Upgrade Nginx to 1.19.3
2020-10-08 20:17:32 -06:00
lemker
ea28f2f32f Upgrade Nginx to 1.19.3 2020-10-08 19:05:47 -07:00
Esteban Cerutti
5c252001a5
Update README.md 2020-10-03 21:08:12 -03:00
Jason Wilder
b0c6c9f67e
Merge pull request #1386 from juliushaertl/enh/hsts-https-method-fallback
Add fallback to the proxy containers env for HTTPS_METHOD and HSTS
2020-06-29 11:38:05 -06:00
Jason Wilder
5b469894d4
Merge pull request #1432 from KetchupBomb/update_readme
Fix docker-gen Docker Hub URL
2020-06-29 11:36:18 -06:00
Jason Wilder
d3ff74e48a
Merge pull request #1452 from benchonaut/patch-1
update key length  , speed up dhparam generation
2020-06-29 11:34:13 -06:00
Benjamin Freitag
be107963a7
update key length , speed up dhparam generation 2020-06-15 04:22:58 +02:00
Brad King
e8b68e5f41 Fix docker-gen Docker Hub URL 2020-05-08 19:09:42 -07:00
Jason Wilder
3cbc5417b7
Merge pull request #1113 from basro/master
Set DISABLE_ACCESS_LOGS env var to disable access logs
2020-03-25 14:27:02 -06:00
Jason Wilder
8219788df6
Merge branch 'master' into master 2020-03-25 14:26:30 -06:00
Nicolas Duchon
944163d70d
Bring ACME no redirection inline with companion
Add the following to the Let's Encrypt ACME challenge "no redirection to HTTPS"
https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion/pull/570
https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion/pull/335
2020-03-20 22:28:15 +01:00
Jason Wilder
941fd630a6
Merge pull request #1069 from ivoputzer/patch-1
Fixes typo
2020-03-03 00:29:54 -05:00
Jason Wilder
b4709639b3
Merge pull request #1353 from nanawel/feature/custom-external-ports-support
Add support for custom external HTTP/HTTPS ports
2020-03-03 00:24:21 -05:00
Jason Wilder
b8141832a3
Merge pull request #1336 from cherouvim/patch-1
typo
2020-02-29 23:11:12 -05:00
Jason Wilder
0223bae0af
Merge pull request #1402 from sgabe/upgrade-nginx
Upgrade to 1.17.8
2020-02-29 23:09:59 -05:00
sgabe
6798a6b800 Upgrade to 1.17.8 2020-02-28 16:36:36 +01:00
Jason Wilder
4a2dc46002
Merge pull request #1198 from umevoshi/master
Add gRPC protocol support (#1345)
2020-02-11 11:45:53 -07:00
Jason Wilder
718d45feaf
Merge pull request #1338 from mauvm/patch-1
Do not HTTPS redirect Let'sEncrypt ACME challenge
2020-02-09 13:31:42 -07:00
Jason Wilder
0dfe09fb7c
Merge pull request #1366 from jakejarvis/nginx-1.17.6
Upgrade nginx to 1.17.6
2020-02-09 13:30:06 -07:00
Julius Härtl
f8b4553eee
Add fallback to the proxy containers env for HTTPS_METHOD and HSTS
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-01-30 08:24:38 +01:00
Jake Jarvis
77227f8691
Upgrade nginx to 1.17.6 2019-12-04 10:19:17 -05:00
Jason Wilder
e762468759
Merge pull request #1356 from matt-hh/upgrade-nginx-1.17.5
Upgrade to 1.17.5
2019-11-08 07:00:06 -07:00
Matthias Döring
cf911d950a Upgrade to 1.17.5
closes #1337, resolves #1355
2019-11-08 14:11:17 +01:00
nanawel
a3e64a9433 Add support for custom external HTTP/HTTPS ports (see https://groups.google.com/forum/#!topic/nginx-proxy/0I2jevmgTLI) 2019-11-03 14:48:16 +01:00
Maurits van Mastrigt
11d644d645
Do not HTTPS redirect Let'sEncrypt ACME challenge
The auto renewal of Let'sEncrypt certificates fails due to the HTTPS redirect of the ACME challenge.

This workaround resolves the issue:
https://gist.github.com/codekitchen/2c519eb7572002afab6a5f979cd42913#file-letsencrypt-diff

Found through this comment:
https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion/issues/526#issuecomment-476253642
2019-10-01 16:00:41 +02:00
Jason Wilder
4443ee8b5a
Merge pull request #1116 from qiqizjl/master
fix fastcgi bug
2019-09-26 13:21:12 -06:00
Jason Wilder
08b953ba70
Merge pull request #1252 from jpomykala/patch-1
Update README.md
2019-09-25 19:44:56 -06:00
Jason Wilder
94f5763c04
Merge pull request #1323 from came88/banner
README.md: fix version in nginx banner
2019-09-25 19:39:17 -06:00
Jason Wilder
8cf9ed7145
Merge pull request #1328 from dnmvisser/patch-1
Typo
2019-09-25 19:37:42 -06:00
Ioannis Cherouvim
3ce7d99aea
typo 2019-09-25 13:21:33 +03:00
Marcel Sinn
45690ee044
Will fix spelling
Just read the documentation and found this spelling issue.
2019-09-19 07:55:43 +02:00
Jason Wilder
3a9de2d511
Merge pull request #1322 from came88/ssl-configuration
Update ssl configuration
2019-09-09 09:04:20 -06:00
came88
eba7d8af77
Fix comment about Mozilla Modern Policy and TLS1.3
Thanks to @deAtog for pointing it out
2019-09-09 12:45:20 +02:00
Dick Visser
d8c04f666f
Typo 2019-09-09 07:22:58 +02:00
Lorenzo Cameroni
ede9f9ec25 README.md: fix version in nginx banner 2019-08-29 22:59:43 +02:00
Lorenzo Cameroni
26e764950f Update ssl configuration 2019-08-29 22:14:14 +02:00
Jason Wilder
b886c0bd14
Merge pull request #1318 from came88/nginx
Upgrade nginx to 1.17.3
2019-08-18 09:13:33 -06:00
Lorenzo Cameroni
a4cc268628 Use nginx 1.17.3 2019-08-18 11:20:05 +02:00
Jason Wilder
eb3613695c
Merge pull request #1313 from JIAZHEN/master
Upgrade nginx to 1.17
2019-08-08 08:26:11 -06:00