Commit Graph

377 Commits

Author SHA1 Message Date
colpari
8579534fe4 add parameters to colpari-build.sh to build selected images 2022-02-04 21:26:21 +01:00
colpari
c4dca967a8 switch to stable upstream source 2022-02-04 21:24:53 +01:00
Frank Fricke
90bd14fcc9 Merge branch 'master' into colpari-master 2022-02-04 20:55:52 +01:00
colpari development
99684f3f88
Merge branch 'zammad:master' into master 2022-02-04 20:55:21 +01:00
pebosi
ba2396f17b update to 7.16.3
including latest log4j release
2022-02-04 20:47:40 +01:00
Marcel Herrguth
2806f0e7ca Raise .env version to 5.0.3-14 to include ES 7.16.2 (#266)
* Raise .env version to 5.0.3-14 to include ES 7.16.2

* Maintenance: Test raised linter version from 3 to 4

* Maintenance: Adjust readme according to linters complaints

* Maintenance: Fix typos
2022-02-04 20:47:40 +01:00
Marcel Herrguth
3e465c6ce7
Merge pull request #267 from pebosi/patch-1
update to 7.16.3
2022-01-28 22:51:42 +01:00
pebosi
6ae09345ad update to 7.16.3
including latest log4j release
2022-01-28 22:19:45 +01:00
Marcel Herrguth
09e1e6b2d7
Raise .env version to 5.0.3-14 to include ES 7.16.2 (#266)
* Raise .env version to 5.0.3-14 to include ES 7.16.2

* Maintenance: Test raised linter version from 3 to 4

* Maintenance: Adjust readme according to linters complaints

* Maintenance: Fix typos
2022-01-28 21:44:56 +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
colpari
df3b6f2db1 Merge remote-tracking branch 'upstream/master' into colpari-master 2021-12-15 18:20:59 +01:00
Marcel Herrguth
78214b03bc 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-15 18:00:49 +01:00
Marcel Herrguth
f74b469ec0 Maintenance: Raise Elasticsearch version to 7.16.1 to mitgitate log4j (#262) 2021-12-15 17:49:12 +01:00
Martin Gruner
b4a011d927 Maintenance: Update image to the new 5.0.3 release. (#259) 2021-12-15 17:49:12 +01:00
André Bauer
5e63ff4c9a Update .env (#257) 2021-12-15 17:49:12 +01:00
André Bauer
a611d03e82 update to 5.0.2-1 (#254) 2021-12-15 17:49:12 +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
André Bauer
0d262239b8
update to 5.0.2-1 (#254) 2021-10-31 23:16:00 +01:00
Frank Fricke
11213f8431 Merge remote-tracking branch 'upstream/master' into colpari-master 2021-10-25 01:36:31 +02:00
André Bauer
53e2c8d6be remove without from bundle command (#250)
* remove without from bundle command

* fix quote
2021-10-25 01:34:31 +02:00
Martin Gruner
0ce020343a Maintenance: Clean-up unneeded test files during the build process. (#249) 2021-10-25 01:34:31 +02:00
André Bauer
97cd755eb7 update elasticsearch to 7.15.1 (non oss) (#248)
* Update Dockerfile

* Update Dockerfile
2021-10-25 01:34:31 +02:00
André Bauer
344ca8c807 update to version 5.0.1-5 (#245) 2021-10-25 01:34:31 +02: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
colpari
265c0adab5 Merge branch 'master' into colpari-master 2021-10-12 18:03:35 +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
colpari
032e34e806 Merge branch 'colpari-master' of github.com:colpari/zammad-docker-compose into colpari-master 2021-09-07 11:16:01 +02:00
colpari
9a32795976 colpari build scripts 2021-09-07 11:15:30 +02:00
colpari
98a2e4b853 Merge remote-tracking branch 'upstream/master' into colpari-master 2021-09-07 10:30:05 +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
colpari
a6305f60fa Merge remote-tracking branch 'upstream/master' into colpari-master 2021-05-27 10:13:24 +02:00