Dirk Klimpel
							
						 
						
							 
							
							
								
								
							
							
								
							
								e938f69697 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix some links in `docs` and `contrib` ( #10370 )  
							
							 
							
							
							
						 
						
							2021-07-13 11:55:48 +01:00  
						
					 
				
					
						
							
							
								 
								lub
							
						 
						
							 
							
							
								
								
							
							
								
							
								890c0c041d 
								
									
								
							
								 
							
						 
						
							
							
								
								Update postgres in the Docker compose example to 12-alpine. ( #7696 )  
							
							 
							
							
							
						 
						
							2020-06-17 08:29:08 -04:00  
						
					 
				
					
						
							
							
								 
								Sandro
							
						 
						
							 
							
							
								
								
							
							
								
							
								d96ac97d29 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix mounting of homeserver.yaml when it does not exist on host ( #6913 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com> 
							
						 
						
							2020-02-29 23:32:26 +00:00  
						
					 
				
					
						
							
							
								 
								Fridtjof Mund
							
						 
						
							 
							
							
								
								
							
							
								
							
								4aea0bd292 
								
									
								
							
								 
							
						 
						
							
							
								
								contrib/docker: remove quotes for POSTGRES_INITDB_ARGS ( #6984 )  
							
							 
							
							... 
							
							
							
							I made a mistake in https://github.com/matrix-org/synapse/pull/6921  - the quotes break the postgres container's startup script (or docker-compose), which makes initdb fail: https://github.com/matrix-org/synapse/pull/6921#issuecomment-590657154 
Signed-off-by: Fridtjof Mund <fridtjof@das-labor.org> 
							
						 
						
							2020-02-25 10:48:13 +00:00  
						
					 
				
					
						
							
							
								 
								Fridtjof Mund
							
						 
						
							 
							
							
								
								
							
							
								
							
								32873efa87 
								
									
								
							
								 
							
						 
						
							
							
								
								contrib/docker: Ensure correct encoding and locale settings on DB creation ( #6921 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Fridtjof Mund <fridtjof@das-labor.org> 
							
						 
						
							2020-02-14 16:27:29 +00:00  
						
					 
				
					
						
							
							
								 
								Fabian Meyer
							
						 
						
							 
							
							
							
								
							
								dd57715de2 
								
							
								 
							
						 
						
							
							
								
								contrib/docker-compose: fixing mount that overrides containers' /etc ( #6656 )  
							
							 
							
							... 
							
							
							
							The mount in the form of ./matrix-config:/etc overwrites the contents of the container /etc folder. Since all valid ca certificates are stored in /etc, the synapse.push.httppusher, for example, cannot validate the certificate from matrix.org. 
							
						 
						
							2020-01-08 07:25:05 +00:00  
						
					 
				
					
						
							
							
								 
								przemas75
							
						 
						
							 
							
							
							
								
							
								c3772a71cb 
								
							
								 
							
						 
						
							
							
								
								Update docker-compose.yml for a static config file, and update traefik examples ( #6142 )  
							
							 
							
							
							
						 
						
							2019-10-18 11:23:33 +02:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								2f7ebc2a55 
								
									
								
							
								 
							
						 
						
							
							
								
								Deprecate the env var way of running the docker image ( #5566 )  
							
							 
							
							... 
							
							
							
							This is mostly a documentation change, but also adds a default value for
SYNAPSE_CONFIG_PATH, so that running from the generated config is the default,
and will Just Work provided your config is in the right place. 
							
						 
						
							2019-06-27 13:49:48 +01:00  
						
					 
				
					
						
							
							
								 
								jribal
							
						 
						
							 
							
							
							
								
							
								265513e499 
								
							
								 
							
						 
						
							
							
								
								Update docker-compose.yml ( #4282 )  
							
							 
							
							... 
							
							
							
							Hi, the original docker-compose file did not work by default.
You get federation port working but no client port.
My proposal is to let federation port work as it is by default (8448) and let traefik handle client http/https traffic. 
							
						 
						
							2019-01-02 07:38:18 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								3149d55b7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3778  from z3ntu/patch-1  
							
							 
							
							... 
							
							
							
							Fix build of Docker image with docker-compose 
							
						 
						
							2018-11-01 17:34:56 +00:00  
						
					 
				
					
						
							
							
								 
								Jonas Schürmann
							
						 
						
							 
							
							
							
								
							
								e3758c8c92 
								
							
								 
							
						 
						
							
							
								
								Fix typo in docker-compose.yml  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de> 
							
						 
						
							2018-10-31 15:46:47 +01:00  
						
					 
				
					
						
							
							
								 
								Luca Weiss
							
						 
						
							 
							
							
								
								
							
							
								
							
								a40802bcbc 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix build of Docker image with docker-compose  
							
							 
							
							... 
							
							
							
							... and fix a typo 
							
						 
						
							2018-09-11 12:11:22 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
								
								
							
							
								
							
								c3f596180f 
								
									
								
							
								 
							
						 
						
							
							
								
								Update README.md  
							
							 
							
							... 
							
							
							
							Link to docker/README.md 
							
						 
						
							2018-08-03 09:15:19 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
							
								
							
								0d25724419 
								
							
								 
							
						 
						
							
							
								
								Refactor docker locations and README.  
							
							 
							
							... 
							
							
							
							This addresses #3224  
							
						 
						
							2018-08-02 18:21:32 +01:00  
						
					 
				
					
						
							
							
								 
								Benedikt Heine
							
						 
						
							 
							
							
							
								
							
								fe089b13cb 
								
							
								 
							
						 
						
							
							
								
								[Docker] Build docker image via compose  
							
							 
							
							... 
							
							
							
							It's much easier to build the image via docker-compose instead of an
error-prone low-level docker call.
Signed-off-by: Benedikt Heine <bebe@bebehei.de> 
							
						 
						
							2018-07-17 09:24:33 +02:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								a2da6de40e 
								
							
								 
							
						 
						
							
							
								
								light grammar changes  
							
							 
							
							
							
						 
						
							2018-05-17 18:12:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
							
								
							
								450f500d0c 
								
							
								 
							
						 
						
							
							
								
								Note that secrets need to be retained.  
							
							 
							
							
							
						 
						
							2018-05-17 18:12:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Kaye
							
						 
						
							 
							
							
							
								
							
								82b0361f02 
								
							
								 
							
						 
						
							
							
								
								Document macaroon env var correctly  
							
							 
							
							
							
						 
						
							2018-05-17 18:12:00 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								4f2e898c29 
								
							
								 
							
						 
						
							
							
								
								Make the logging level configurable  
							
							 
							
							
							
						 
						
							2018-05-01 20:50:03 +02:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								d4c14e1438 
								
							
								 
							
						 
						
							
							
								
								Fix the documentation about 'POSTGRES_DB'  
							
							 
							
							
							
						 
						
							2018-05-01 20:47:58 +02:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								f44b7c022f 
								
							
								 
							
						 
						
							
							
								
								Disable logging to file and rely on the console when using Docker  
							
							 
							
							
							
						 
						
							2018-02-10 23:57:51 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								07f1b71819 
								
							
								 
							
						 
						
							
							
								
								Explicitely provide the postgres password to synapse in the Compose example  
							
							 
							
							
							
						 
						
							2018-02-10 23:57:36 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								b815aa0e2d 
								
							
								 
							
						 
						
							
							
								
								Remove an accidentally committed test configuration  
							
							 
							
							
							
						 
						
							2018-02-10 21:59:58 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								6f0b1f85f9 
								
							
								 
							
						 
						
							
							
								
								Generate macaroon and registration secrets, then store the results to the data dir  
							
							 
							
							
							
						 
						
							2018-02-10 00:05:03 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								ca70148c05 
								
							
								 
							
						 
						
							
							
								
								Fix the path to the log config file  
							
							 
							
							
							
						 
						
							2018-02-09 00:23:19 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								e511979fe6 
								
							
								 
							
						 
						
							
							
								
								Make SYNAPSE_MACAROON_SECRET_KEY a mandatory option  
							
							 
							
							
							
						 
						
							2018-02-09 00:13:26 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								a03c382966 
								
							
								 
							
						 
						
							
							
								
								Specify the Docker registry for the postgres image  
							
							 
							
							
							
						 
						
							2018-02-08 22:00:43 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								48e2c641b8 
								
							
								 
							
						 
						
							
							
								
								Specify the Docker registry in the build tag  
							
							 
							
							
							
						 
						
							2018-02-08 21:58:12 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								d8680c969b 
								
							
								 
							
						 
						
							
							
								
								Make it clear that the image has two modes of operation  
							
							 
							
							
							
						 
						
							2018-02-08 21:55:35 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								ef1f8d4be6 
								
							
								 
							
						 
						
							
							
								
								Enable email server configuration from environment variables  
							
							 
							
							
							
						 
						
							2018-02-08 20:53:12 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								a0af0054ec 
								
							
								 
							
						 
						
							
							
								
								Honor the SYNAPSE_REPORT_STATS parameter in the Docker image  
							
							 
							
							
							
						 
						
							2018-02-08 20:46:11 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								914a59cb8c 
								
							
								 
							
						 
						
							
							
								
								Disable the Web client in the Docker image  
							
							 
							
							
							
						 
						
							2018-02-08 20:43:45 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								e174c46a29 
								
							
								 
							
						 
						
							
							
								
								Use 'synapse' as a default postgres user in Docker examples  
							
							 
							
							
							
						 
						
							2018-02-08 20:42:57 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								b8a4dceb3c 
								
							
								 
							
						 
						
							
							
								
								Refactor the start script to better handle mandatory parameters  
							
							 
							
							
							
						 
						
							2018-02-08 20:41:41 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								084afbb6a0 
								
							
								 
							
						 
						
							
							
								
								Rename the permissions variable to avoid confusion  
							
							 
							
							
							
						 
						
							2018-02-08 19:50:04 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								58df3a8c5d 
								
							
								 
							
						 
						
							
							
								
								Add some documentation about high performance storage  
							
							 
							
							
							
						 
						
							2018-02-08 19:48:53 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								63fd148724 
								
							
								 
							
						 
						
							
							
								
								Make it clear that two modes are avaiable in the documentation, improve the compose file  
							
							 
							
							
							
						 
						
							2018-02-08 19:46:11 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								1ffd9cb936 
								
							
								 
							
						 
						
							
							
								
								Support loading application service files from /data/appservices/  
							
							 
							
							
							
						 
						
							2018-02-05 23:13:27 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								ee3b160a2a 
								
							
								 
							
						 
						
							
							
								
								Only generate configuration files when necessary  
							
							 
							
							
							
						 
						
							2018-02-05 22:57:35 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								f5364b47ec 
								
							
								 
							
						 
						
							
							
								
								Point to the 'latest' tag in the Docker documentation  
							
							 
							
							
							
						 
						
							2018-02-05 22:14:40 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								d8c7da5dca 
								
							
								 
							
						 
						
							
							
								
								Fix a typo in the Docker README  
							
							 
							
							
							
						 
						
							2018-02-05 22:12:50 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								cf4ef60e28 
								
							
								 
							
						 
						
							
							
								
								Document the cache factor environment variable for Docker  
							
							 
							
							
							
						 
						
							2018-02-05 22:10:03 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								cd51931b62 
								
							
								 
							
						 
						
							
							
								
								Add dynamic TURN configuration in the Docker image  
							
							 
							
							
							
						 
						
							2018-02-05 21:53:53 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								81010a126e 
								
							
								 
							
						 
						
							
							
								
								Add dynamic recaptcha configuration in the Docker image  
							
							 
							
							
							
						 
						
							2018-02-05 21:28:15 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								e9021e16c4 
								
							
								 
							
						 
						
							
							
								
								Run the server as an unprivileged user  
							
							 
							
							
							
						 
						
							2018-02-04 23:19:08 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								f72c9c1fb6 
								
							
								 
							
						 
						
							
							
								
								Fix multiple typos  
							
							 
							
							
							
						 
						
							2018-02-04 16:18:40 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								9a87b8aaf7 
								
							
								 
							
						 
						
							
							
								
								Update sumperdump Docker readme to match this image properties  
							
							 
							
							
							
						 
						
							2018-02-04 15:27:32 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								84a9209ba7 
								
							
								 
							
						 
						
							
							
								
								Remove etc/service files from rob's branch  
							
							 
							
							
							
						 
						
							2018-02-04 15:08:43 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								53965334da 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/rob/docker' into feat-dockerfile  
							
							 
							
							
							
						 
						
							2018-02-04 15:08:19 +01:00  
						
					 
				
					
						
							
							
								 
								kaiyou
							
						 
						
							 
							
							
							
								
							
								a207cccb05 
								
							
								 
							
						 
						
							
							
								
								Reuse environment variables of the postgres container  
							
							 
							
							
							
						 
						
							2018-02-04 15:04:26 +01:00