Commit graph

836 commits

Author SHA1 Message Date
Nicolas Duchon
6e17d6ff7b
Merge pull request #1505 from ecerutti/patch-1
Update README.md
2021-04-05 09:57:53 +02:00
Nicolas Duchon
2b32f44454
Merge pull request #1145 from kfkonrad/master
Clarify default host usage
2021-04-05 09:50:34 +02:00
Nicolas Duchon
0f427dd32d
Merge pull request #1184 from kylegoetz/master
Update README.md - sample yml needed expose option
2021-04-05 09:46:40 +02:00
Nicolas Duchon
21caa570fb
Merge pull request #1332 from ArgonQQ/patch-1
Will fix spelling
2021-04-05 09:31:18 +02:00
R0Wi
8b9b2fa000
Fix test image names 2021-04-03 08:41:48 +02:00
R0Wi
0a9ddf8b70
Merge remote-tracking branch 'upstream/master' into merge_upstream 2021-04-03 08:28:05 +02:00
Nicolas Duchon
fcfe17a0a4
Merge pull request #1538 from S0obi/patch-1
Update docker-entrypoint.sh comment on DHPARAM default key size
2021-04-02 01:49:36 +02:00
Nicolas Duchon
d120ce9fde
ci: push images to jwilder/nginx-proxy 2021-04-02 00:39:41 +02:00
Nicolas Duchon
4a1d5bfc58
ci: build and push for arm64 and arm/v7 archs 2021-04-01 22:23:37 +02:00
Nicolas Duchon
bea149e317
ci: create dependabot config for Docker ecosystem 2021-04-01 21:06:33 +02:00
Nicolas Duchon
65b44f0ca2
Merge pull request #1470 from KWARC/build-from-scratch
Enable multi-architecture docker image builds
2021-04-01 19:08:23 +02:00
Nicolas Duchon
ad7c02570b
chore: use nginxproxy's DockerHub registry
Transitioning away from jwilder/nginx-proxy
Please see #1304 for more details
2021-04-01 16:06:09 +02:00
Tom Wiesing
83ca0511d1
Hardcode nginx 1.19.3 for use in Docker Images
This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to use
'nginx 1.19.3'. This change was implemented after feedback from @buchdag
to be able to use dependabot.
2021-04-01 15:54:26 +02:00
Tom Wiesing
6b8cd894da
Hardcode go 1.15.10 for use in Docker Images
This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to use
'go.15.10' when building the dependencies. This change was implemented
after feedback from @buchdag to be able to use dependabot.
2021-04-01 13:54:37 +02:00
Nicolas Duchon
3a8b49f153
ci: build and push to DockerHub w/ GitHub Actions 2021-04-01 12:14:32 +02:00
Tom Wiesing
886dd04b62
Enable multi-architecture docker image builds
Previously, the Dockerfile downloaded 'docker-gen' and 'forego' binaries
during build time. This caused a problem as it hard-coded the amd64
architecture for the images.

This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to build
the `forego` and `docker-gen` executables from scratch instead of
downloading binaries directly.

This is achieved using multi-stage builds [1]. Two seperate stages first
build the binaries, and are then copied over to the final stage.

The advantage of this change is two-fold: First, it enables building
this image on architectures other than amd64. Secondly it adds trust by
not adding external binaries to the docker image.

This modified version passes the test both a linux desktop (amd64) as
well as a raspberry pi (armv7) with some caveats:

- On armv7, a modified version of the `jwilder/docker-gen` image is
required. See a seperate PR at [2].

- The 'test_dhparam_is_generated_if_missing' test fails. This also
doesn't currently pass on master.

[1] https://docs.docker.com/develop/develop-images/multistage-build/ [2]
https://github.com/jwilder/docker-gen/pull/327
2021-03-21 12:31:06 +01:00
Nicolas Duchon
bf2d7295d3
Merge pull request #1409 from nginx-proxy/no-https-redirect-acme
Bring ACME no redirection inline with companion
2021-03-17 20:31:37 +01:00
Joe Polny
1a0d0d822e update IPv6 section in README 2021-02-06 18:56:30 +00:00
Joe Polny
2bde43c6e9 remove scoped ipv6 resolvers 2021-02-05 19:56:56 +00:00
Thibault Soubiran
8d0ab90536 Update README for DHParam default size 2020-12-06 19:09:55 +01:00
Thibault Soubiran
aba100ff7b
Update docker-entrypoint.sh
Default key size is not 2048 anymore but 4096, reference : https://github.com/nginx-proxy/nginx-proxy/blob/master/generate-dhparam.sh#L4
2020-12-02 13:18:32 +01:00
Jason Wilder
c8a6785898 Update version to 0.8.0 2020-10-30 10:19:56 -06:00
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