André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							60a6fc202f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop/changes-for-zammad-5.1  
						
						
						
					 
					
						2022-01-27 01:27:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marcel Herrguth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							acf378a8f7 
							
						 
					 
					
						
						
							
							Merge pull request  #265  from TuringTux/use-es-7.16.2  
						
						... 
						
						
						
						Use latest elasticsearch version 7.16.2 
						
					 
					
						2021-12-20 16:58:54 +01:00 
						 
				 
			
				
					
						
							
							
								TuringTux 
							
						 
					 
					
						
						
						
						
							
						
						
							7a0ba8ce35 
							
						 
					 
					
						
						
							
							Use latest elasticsearch version  
						
						
						
					 
					
						2021-12-20 12:36:56 +01:00 
						 
				 
			
				
					
						
							
							
								Marcel Herrguth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e697dcd493 
							
						 
					 
					
						
						
							
							Bump compose-Version ( #263 )  
						
						... 
						
						
						
						* Maintenance: Raise schema version from 5.0.1 to 5.0.3
* Closes  #262  - Raise default tag version to 5.0.3-7
Contains ES 7.16.1 
						
					 
					
						2021-12-14 11:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Marcel Herrguth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17c5d209bd 
							
						 
					 
					
						
						
							
							Maintenance: Raise Elasticsearch version to 7.16.1 to mitgitate log4j ( #262 )  
						
						
						
					 
					
						2021-12-14 10:24:59 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Gruner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							efbe666429 
							
						 
					 
					
						
						
							
							Maintenance: Update image to the new 5.0.3 release. ( #259 )  
						
						
						
					 
					
						2021-12-07 12:39:46 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9842a689e4 
							
						 
					 
					
						
						
							
							Update .env ( #257 )  
						
						
						
					 
					
						2021-11-27 01:55:12 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Gruner 
							
						 
					 
					
						
						
						
						
							
						
						
							bf534fbd5d 
							
						 
					 
					
						
						
							
							Maintenance: Remove obsolete fetch_locales call.  
						
						
						
					 
					
						2021-11-15 18:38:17 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0d262239b8 
							
						 
					 
					
						
						
							
							update to 5.0.2-1 ( #254 )  
						
						
						
					 
					
						2021-10-31 23:16:00 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a703b63cb1 
							
						 
					 
					
						
						
							
							remove without from bundle command ( #250 )  
						
						... 
						
						
						
						* remove without from bundle command
* fix quote 
						
					 
					
						2021-10-20 13:35:09 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Gruner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							01daa74920 
							
						 
					 
					
						
						
							
							Maintenance: Clean-up unneeded test files during the build process. ( #249 )  
						
						
						
					 
					
						2021-10-19 11:53:10 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c5a6f5afec 
							
						 
					 
					
						
						
							
							update elasticsearch to 7.15.1 (non oss) ( #248 )  
						
						... 
						
						
						
						* Update Dockerfile
* Update Dockerfile 
						
					 
					
						2021-10-18 23:45:56 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4b22c2e442 
							
						 
					 
					
						
						
							
							update to version 5.0.1-5 ( #245 )  
						
						
						
					 
					
						2021-10-13 15:55:25 +02:00 
						 
				 
			
				
					
						
							
							
								Steffen Zieger 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7458686643 
							
						 
					 
					
						
						
							
							set same version in all docker-compose files ( #242 )  
						
						... 
						
						
						
						Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
						
					 
					
						2021-10-08 12:35:55 +02:00 
						 
				 
			
				
					
						
							
							
								Thorsten 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cda3c41c7a 
							
						 
					 
					
						
						
							
							Release Update 5.0.1. ( #243 )  
						
						... 
						
						
						
						* Release Update 5.0.1.
* Update .env
Co-authored-by: Thorsten Eckel <{ID}+{username}@users.noreply.github.com>
Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
						
					 
					
						2021-10-08 12:35:34 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							defd3fbdcf 
							
						 
					 
					
						
						
							
							fix in memory db usage ( #241 )  
						
						... 
						
						
						
						* fix in memeory db
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* fix linter
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* disable jscpd
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* added env to init container too
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* remove whitespaces
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* fix typo
Signed-off-by: André Bauer <andre.bauer@staffbase.com> 
						
					 
					
						2021-10-06 14:16:13 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							701627f9c6 
							
						 
					 
					
						
						
							
							update zammad labels to 5.0.0 ( #239 )  
						
						... 
						
						
						
						* FillDB was renamed to FillDb for Zammad 5.
* Changed Ruby dependency to 2.7.3.
* Update containers/zammad/Dockerfile
* added redis / changed memcached
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* update memcached
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* fix image
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* remove nginx duplicate
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* added nodejs
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* added cache clear and removed links
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* fix typo
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* update zammmad version label to 5.0.0
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
Co-authored-by: Martin Gruner <mg@zammad.com>
Co-authored-by: Martin Gruner <mg.pub@gmx.net> 
						
					 
					
						2021-10-05 22:20:00 +02:00 
						 
				 
			
				
					
						
							
							
								Arnaud Veron 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b531521da8 
							
						 
					 
					
						
						
							
							Fix error "base64: invalid input" causing init container crash ( #232 )  
						
						... 
						
						
						
						* Fix error "base64: invalid input" causing init container crash
Fixes  zammad/zammad-docker-compose#231 
* Update containers/zammad/docker-entrypoint.sh
* Update containers/zammad/docker-entrypoint.sh
Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
						
					 
					
						2021-10-05 21:59:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thorsten 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							11db944a4d 
							
						 
					 
					
						
						
							
							Applied workaround required for Rails update Cache issue ( #238 )  
						
						... 
						
						
						
						https://github.com/zammad/zammad/issues/3786  / https://github.com/zammad/zammad/issues/3759 
Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
					
						2021-10-05 21:41:40 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Gruner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9aad202b60 
							
						 
					 
					
						
						
							
							Changes for Zammad 5 ( #219 )  
						
						... 
						
						
						
						* FillDB was renamed to FillDb for Zammad 5.
* Changed Ruby dependency to 2.7.3.
* Update containers/zammad/Dockerfile
* added redis / changed memcached
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* update memcached
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* fix image
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* remove nginx duplicate
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* added nodejs
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* added cache clear and removed links
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
* fix typo
Signed-off-by: André Bauer <andre.bauer@staffbase.com>
Co-authored-by: André Bauer <monotek@users.noreply.github.com>
Co-authored-by: André Bauer <andre.bauer@staffbase.com> 
						
					 
					
						2021-10-05 21:25:26 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Gruner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db7ca4b92d 
							
						 
					 
					
						
						
							
							Fixes: 224 - Escape special characters in 'sed' replace pattern to support passwords with special characters. ( #226 )  
						
						
						
					 
					
						2021-08-16 19:00:59 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Gruner 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							be6cce84f0 
							
						 
					 
					
						
						
							
							Maintenance: Provide a safer way to force a rebuild of the Elasticsearch volume data on upgrades. ( #225 )  
						
						... 
						
						
						
						Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
						
					 
					
						2021-08-13 16:00:05 +02:00 
						 
				 
			
				
					
						
							
							
								Mantas Masalskis 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a5ab85d651 
							
						 
					 
					
						
						
							
							Maintenance: Ruby updated to 2.6.8 ( #227 )  
						
						
						
					 
					
						2021-08-11 14:52:57 +02:00 
						 
				 
			
				
					
						
							
							
								Marcel Herrguth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3866262aa5 
							
						 
					 
					
						
						
							
							Maintenance: Provide performance tuning options for docker-compose ( #217 )  
						
						... 
						
						
						
						* Maintenance: Provide performance tuning options for docker-compose
* Maintenance: Ensure PUMA_OPTS being available anytime
* Maintenance: Move PUMA_OPTS position
* Maintenance: Adjust puma startup command to allow cluster workers
* Maintenance: Solve SC2086
* Maintenance: Ensure puma knows it's config
* Fix Typo to load config file
* Maintenance: Tell puma what its correct config is...
* fix bind
Signed-off-by: André Bauer <monotek23@gmail.com>
* change concurency to 0 by default
Signed-off-by: André Bauer <monotek23@gmail.com>
Co-authored-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-06-23 18:04:19 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fb9a9b2085 
							
						 
					 
					
						
						
							
							update to 4.1.0-6  
						
						
						
					 
					
						2021-06-14 21:42:41 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0c4c6b8b59 
							
						 
					 
					
						
						
							
							Update .env ( #215 )  
						
						
						
					 
					
						2021-06-09 17:30:30 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ab745072cd 
							
						 
					 
					
						
						
							
							update zammad to 4.1.0 ( #214 )  
						
						... 
						
						
						
						* update to 4.1.0
Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-06-08 17:08:48 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3552f447ba 
							
						 
					 
					
						
						
							
							update to 4.0.0-25  
						
						
						
					 
					
						2021-04-26 16:39:53 +02:00 
						 
				 
			
				
					
						
							
							
								olafbuitelaar 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a77de6a442 
							
						 
					 
					
						
						
							
							Update backup.sh ( #204 )  
						
						... 
						
						
						
						i suppose this change should be reflected here as well; 3d86eb8543 
						
					 
					
						2021-04-24 19:50:55 +02:00 
						 
				 
			
				
					
						
							
							
								Marcel 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ccb9ca3226 
							
						 
					 
					
						
						
							
							Fixes   #205  - Automatically remove IPv6 listen directive ( #207 )  
						
						... 
						
						
						
						* Fixes  #205  - Automatically remove IPv6 listen directive
* Update docker-entrypoint.sh
Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
						
					 
					
						2021-04-24 15:20:03 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8eadbd39a1 
							
						 
					 
					
						
						
							
							Update .env ( #201 )  
						
						
						
					 
					
						2021-04-08 20:24:49 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9dbd862451 
							
						 
					 
					
						
						
							
							Update to 4.0.0-13 ( #199 )  
						
						... 
						
						
						
						* Update .env
* Update .env 
						
					 
					
						2021-04-01 18:55:35 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fda5b3075c 
							
						 
					 
					
						
						
							
							update to 4.0.0 ( #198 )  
						
						... 
						
						
						
						Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-03-28 13:09:25 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							55a8183190 
							
						 
					 
					
						
						
							
							add RAILS_LOG_TO_STDOUT to zammad container ( #197 )  
						
						... 
						
						
						
						Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-03-26 22:58:00 +01:00 
						 
				 
			
				
					
						
							
							
								Thorsten 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6ddc9262ed 
							
						 
					 
					
						
						
							
							Added mimemagic gem version 0.3.7 dependency. ( #195 )  
						
						
						
					 
					
						2021-03-26 11:00:32 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b39454dc36 
							
						 
					 
					
						
						
							
							update to 3.6.0-67 ( #194 )  
						
						... 
						
						
						
						* update to 3.6.0-67
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix ci name
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix typo
Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-03-19 15:04:38 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
						
						
							
						
						
							73a4fbd453 
							
						 
					 
					
						
						
							
							split ci  
						
						... 
						
						
						
						Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-03-19 13:13:10 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9eda319ed3 
							
						 
					 
					
						
						
							
							use port 8080 for nginx ( #193 )  
						
						... 
						
						
						
						* use port 8080 for nginx
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix test
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix port in override file
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix logging
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix compose cmd
Signed-off-by: André Bauer <monotek23@gmail.com>
* fix ci timeout
Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2021-03-18 21:53:46 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b1ce16963a 
							
						 
					 
					
						
						
							
							Update .env ( #191 )  
						
						
						
					 
					
						2021-03-05 03:01:22 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							538f19d0b2 
							
						 
					 
					
						
						
							
							move nginx static config to build ( #190 )  
						
						... 
						
						
						
						move nginx static config to build... 
						
					 
					
						2021-03-03 20:53:51 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							288b91a0cd 
							
						 
					 
					
						
						
							
							remove gosu and run nginx as zammad user ( #189 )  
						
						... 
						
						
						
						remove gosu and run nginx as zammad user 
						
					 
					
						2021-03-03 20:28:03 +01:00 
						 
				 
			
				
					
						
							
							
								Thorsten 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7ef7084e48 
							
						 
					 
					
						
						
							
							Migrate to elasticsearch OSS ( #186 )  
						
						
						
					 
					
						2021-02-05 18:35:04 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c76180b7d9 
							
						 
					 
					
						
						
							
							update elasticsearch to 7.10.1 ( #185 )  
						
						
						
					 
					
						2021-01-04 13:39:59 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							04e6220993 
							
						 
					 
					
						
						
							
							added codespell & superlinter / updated versions ( #183 )  
						
						... 
						
						
						
						* added codespell linter
* added superlinter
* raised env version to 3.6.0-20
* updated memcache container
* updated postgres container
* some readme fixes
* use fixed ubuntu 20.04 version for all github action steps 
						
					 
					
						2020-12-07 13:41:12 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2f9d7b32ed 
							
						 
					 
					
						
						
							
							Update Dockerfile  
						
						
						
					 
					
						2020-11-19 00:01:17 +01:00 
						 
				 
			
				
					
						
							
							
								Thorsten 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							99cd79a748 
							
						 
					 
					
						
						
							
							Release Update 3.6. ( #181 )  
						
						... 
						
						
						
						* Release Update 3.6.
* Added VERSION ENV. 
						
					 
					
						2020-11-18 19:02:40 +01:00 
						 
				 
			
				
					
						
							
							
								Ross Crawford-d'Heureuse 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							30d25a9151 
							
						 
					 
					
						
						
							
							update image to 3.5.0-20 ( #179 )  
						
						... 
						
						
						
						* bumped to 3.6.0-82
* Update .env
Co-authored-by: Ross Crawford-d'Heureuse <ross.crawford@mindcurv.com>
Co-authored-by: André Bauer <monotek@users.noreply.github.com> 
						
					 
					
						2020-11-11 16:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7d15c4909a 
							
						 
					 
					
						
						
							
							update zammad version & made es reindex optional ( #175 )  
						
						... 
						
						
						
						Signed-off-by: André Bauer <monotek23@gmail.com> 
						
					 
					
						2020-09-25 14:35:49 +02:00 
						 
				 
			
				
					
						
							
							
								André Bauer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							297c3f8004 
							
						 
					 
					
						
						
							
							updated memcached image  
						
						
						
					 
					
						2020-09-24 18:23:02 +02:00 
						 
				 
			
				
					
						
							
							
								Thorsten Eckel 
							
						 
					 
					
						
						
						
						
							
						
						
							9f79620f9e 
							
						 
					 
					
						
						
							
							Maintenance: Updated ruby dependency from 2.6.5 to 2.6.6.  
						
						
						
					 
					
						2020-09-22 13:56:31 +02:00