polarathene 
							
						 
					 
					
						
						
							
						
						ac066a73e4 
					 
					
						
						
							
							feat: Replace generated DH params with RFC 7919 standardized DHE groups  
						
						 
						
						... 
						
						
						
						- While the anonymous VOLUME can be dropped from Dockerfile, the path needs to be valid at run-time, might as well ensure it's available by creating the dhparam folder at build.
- Generation logic no longer necessary, dropped. 
- Standardized RFC 7919 groups added (2048, 3072, 4096), with 4096-bit remaining the default size. The DH logic can live in the entrypoint script as well. 
- Third-party supplied pre-generated DH params removed as they're not considered trustworthy compared to RFC 7919 groups. 
						
						
					 
					
						2021-09-28 21:30:02 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						583c71ec3d 
					 
					
						
						
							
							chore(deps): bump nginx from 1.21.1 to 1.21.3  
						
						 
						
						... 
						
						
						
						Bumps nginx from 1.21.1 to 1.21.3.
---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-09-10 04:12:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						c36633320e 
					 
					
						
						
							
							chore(deps): bump golang from 1.16.6 to 1.16.7  
						
						 
						
						... 
						
						
						
						Bumps golang from 1.16.6 to 1.16.7.
---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-08-06 04:11:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						8526d918ed 
					 
					
						
						
							
							style: Dockerfiles linting  
						
						 
						
						
						
						
					 
					
						2021-08-04 08:49:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						897e4135d3 
					 
					
						
						
							
							build: docker-gen 0.7.6 -> 0.7.7  
						
						 
						
						
						
						
					 
					
						2021-08-04 08:48:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						0b735897cb 
					 
					
						
						
							
							chore(deps): bump golang from 1.16.5 to 1.16.6  
						
						 
						
						... 
						
						
						
						Bumps golang from 1.16.5 to 1.16.6.
---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-07-15 04:11:52 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						d743160597 
					 
					
						
						
							
							chore(deps): bump nginx from 1.21.0 to 1.21.1  
						
						 
						
						... 
						
						
						
						Bumps nginx from 1.21.0 to 1.21.1.
---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-07-09 04:11:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						987c996173 
					 
					
						
						
							
							Merge pull request  #1641  from nginx-proxy/dependabot/docker/nginx-1.21.0  
						
						 
						
						... 
						
						
						
						chore(deps): bump nginx from 1.19.10 to 1.21.0 
						
						
					 
					
						2021-06-14 13:47:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						1967ca2a57 
					 
					
						
						
							
							chore(deps): bump golang from 1.15.10 to 1.16.5  
						
						 
						
						... 
						
						
						
						Bumps golang from 1.15.10 to 1.16.5.
---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-06-08 23:28:24 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						ae5623916b 
					 
					
						
						
							
							chore(deps): bump nginx from 1.19.10 to 1.21.0  
						
						 
						
						... 
						
						
						
						Bumps nginx from 1.19.10 to 1.21.0.
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-06-08 23:28:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						7f2307626d 
					 
					
						
						
							
							Merge pull request  #1603  from nginx-proxy/forego  
						
						 
						
						... 
						
						
						
						Chore: switch to go mod compatible fork of forego 
						
						
					 
					
						2021-06-09 01:27:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						242caf9e69 
					 
					
						
						
							
							chore: switch to go mod compatible fork of forego  
						
						 
						
						
						
						
					 
					
						2021-06-09 01:18:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						35df872705 
					 
					
						
						
							
							Merge pull request  #973  from Sparted/master  
						
						 
						
						... 
						
						
						
						Upd: Boost worker_connections from 1024 to 10240. 
						
						
					 
					
						2021-04-28 21:39:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot[bot] 
							
						 
					 
					
						
						
							
						
						5e4f005240 
					 
					
						
						
							
							Bump nginx from 1.19.3 to 1.19.10  
						
						 
						
						... 
						
						
						
						Bumps nginx from 1.19.3 to 1.19.10.
Signed-off-by: dependabot[bot] <support@github.com > 
						
						
					 
					
						2021-04-26 22:44:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nicolas Duchon 
							
						 
					 
					
						
						
							
						
						f8aa9a1637 
					 
					
						
						
							
							chore: bump docker-gen from 0.7.4 to 0.7.6  
						
						 
						
						
						
						
					 
					
						2021-04-26 14:55:33 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								lemker 
							
						 
					 
					
						
						
							
						
						ea28f2f32f 
					 
					
						
						
							
							Upgrade Nginx to 1.19.3  
						
						 
						
						
						
						
					 
					
						2020-10-08 19:05:47 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sgabe 
							
						 
					 
					
						
						
							
						
						6798a6b800 
					 
					
						
						
							
							Upgrade to 1.17.8  
						
						 
						
						
						
						
					 
					
						2020-02-28 16:36:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jake Jarvis 
							
						 
					 
					
						
						
							
						
						77227f8691 
					 
					
						
						
							
							Upgrade nginx to 1.17.6  
						
						 
						
						
						
						
					 
					
						2019-12-04 10:19:17 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						cf911d950a 
					 
					
						
						
							
							Upgrade to 1.17.5  
						
						 
						
						... 
						
						
						
						closes  #1337 , resolves  #1355  
						
						
					 
					
						2019-11-08 14:11:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lorenzo Cameroni 
							
						 
					 
					
						
						
							
						
						a4cc268628 
					 
					
						
						
							
							Use nginx 1.17.3  
						
						 
						
						
						
						
					 
					
						2019-08-18 11:20:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jiazhen Xie 
							
						 
					 
					
						
						
							
						
						16169a0f74 
					 
					
						
						
							
							Use nginx latest version  
						
						 
						
						
						
						
					 
					
						2019-08-07 17:32:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gpkfr 
							
						 
					 
					
						
						
							
						
						58c1fe3606 
					 
					
						
						
							
							Upgrade to nginx 1.14.1 stable version  
						
						 
						
						
						
						
					 
					
						2018-11-09 15:26:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						cb2b0e2bd3 
					 
					
						
						
							
							Upgrade to nginx 1.14 stable  
						
						 
						
						
						
						
					 
					
						2018-06-06 00:56:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								C-A de Salaberry 
							
						 
					 
					
						
						
							
						
						4932ef3036 
					 
					
						
						
							
							Upd: Boost worker_connections from 1024 to 10240.  
						
						 
						
						
						
						
					 
					
						2018-02-07 15:30:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason Wilder 
							
						 
					 
					
						
						
							
						
						32d42ffee7 
					 
					
						
						
							
							Update docker-gen to 0.7.4  
						
						 
						
						
						
						
					 
					
						2018-01-14 15:28:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cglewis 
							
						 
					 
					
						
						
							
						
						55610b8425 
					 
					
						
						
							
							MAINTAINER is deprecated, using LABEL now  
						
						 
						
						
						
						
					 
					
						2017-10-31 18:21:12 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						93d90884e2 
					 
					
						
						
							
							Implemented NETWORK_ACCESS (squash commit)  
						
						 
						
						
						
						
					 
					
						2017-10-18 13:29:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						febf85d7e2 
					 
					
						
						
							
							Move to 1.13 base image to get auto updates  
						
						 
						
						... 
						
						
						
						Less maintenance and more security
Resolves  #880  
						
						
					 
					
						2017-07-21 13:45:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						761bbf9dbc 
					 
					
						
						
							
							Removed duplicate server_names_hash_bucket_size directive  
						
						 
						
						
						
						
					 
					
						2017-06-18 21:21:05 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason Wilder 
							
						 
					 
					
						
						
							
						
						c41186a3a4 
					 
					
						
						
							
							Merge branch 'master' into feature_ssl_improvement  
						
						 
						
						
						
						
					 
					
						2017-06-14 16:31:12 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								neil 
							
						 
					 
					
						
						
							
						
						1867228cce 
					 
					
						
						
							
							fix worker_processes to "auto"  
						
						 
						
						
						
						
					 
					
						2017-06-12 15:59:55 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hüske 
							
						 
					 
					
						
						
							
						
						2c4102d396 
					 
					
						
						
							
							Upgrade to 1.13.0  
						
						 
						
						
						
						
					 
					
						2017-05-04 18:57:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						172d79aff4 
					 
					
						
						
							
							Upgrade to nginx 1.11.13  
						
						 
						
						
						
						
					 
					
						2017-04-07 12:58:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						ad9af2884d 
					 
					
						
						
							
							Merged master, fixed BATS conflict  
						
						 
						
						
						
						
					 
					
						2017-03-06 10:48:12 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						7bafa37a52 
					 
					
						
						
							
							Upgrade to nginx 1.11.10  
						
						 
						
						
						
						
					 
					
						2017-02-21 14:03:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						15cbb5debf 
					 
					
						
						
							
							Upgrade to nginx 1.11.9  
						
						 
						
						
						
						
					 
					
						2017-02-05 21:40:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						dfdd67f5a4 
					 
					
						
						
							
							Implemented background dhparam generation  
						
						 
						
						
						
						
					 
					
						2017-01-11 22:43:09 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						f186815c2d 
					 
					
						
						
							
							Merged upstream  
						
						 
						
						
						
						
					 
					
						2017-01-11 22:42:35 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthias Döring 
							
						 
					 
					
						
						
							
						
						004cc3cb8c 
					 
					
						
						
							
							Upgrade to nginx 1.11.8  
						
						 
						
						
						
						
					 
					
						2016-12-28 23:38:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cody Ramaker 
							
						 
					 
					
						
						
							
						
						b66398d1bf 
					 
					
						
						
							
							Updated nginx to 1.11.6  
						
						 
						
						
						
						
					 
					
						2016-12-08 13:24:49 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						b0de80d46b 
					 
					
						
						
							
							Moved config edits from Dockerfile to template  
						
						 
						
						
						
						
					 
					
						2016-10-03 10:21:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						8534185b0c 
					 
					
						
						
							
							Added newline to config  
						
						 
						
						
						
						
					 
					
						2016-10-03 10:05:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steve Kamerman 
							
						 
					 
					
						
						
							
						
						0b1e9e56e1 
					 
					
						
						
							
							Issue  #535  Added default 2048-bit dhparam.pem file  
						
						 
						
						
						
						
					 
					
						2016-09-29 16:48:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hwang 
							
						 
					 
					
						
						
							
						
						03e863d838 
					 
					
						
						
							
							upgrade nginx to 1.11.3  
						
						 
						
						
						
						
					 
					
						2016-08-25 20:16:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hwang 
							
						 
					 
					
						
						
							
						
						86c408bbdd 
					 
					
						
						
							
							upgrade nginx to 1.11.0  
						
						 
						
						
						
						
					 
					
						2016-07-29 21:17:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason Wilder 
							
						 
					 
					
						
						
							
						
						8ed5ab38b8 
					 
					
						
						
							
							Update to docker-gen 0.7.3  
						
						 
						
						
						
						
					 
					
						2016-06-13 00:24:21 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason Wilder 
							
						 
					 
					
						
						
							
						
						c256f31728 
					 
					
						
						
							
							Update nginx 1.9.15  
						
						 
						
						
						
						
					 
					
						2016-06-10 20:08:10 -06:00