Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 653a26cca0 | |||
|
31901f57ae
|
|||
| ec0ad78ef4 |
20
compose.yml
20
compose.yml
@ -45,7 +45,7 @@ x-shared:
|
|||||||
SSO_PROVIDER_DOMAIN:
|
SSO_PROVIDER_DOMAIN:
|
||||||
IDP_SSO_TARGET_URL:
|
IDP_SSO_TARGET_URL:
|
||||||
IDP_SLO_SERVICE_URL:
|
IDP_SLO_SERVICE_URL:
|
||||||
image: ghcr.io/zammad/zammad:6.5.0-34
|
image: ghcr.io/zammad/zammad:6.5.2-22
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
@ -69,7 +69,7 @@ x-shared:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
zammad-elasticsearch:
|
zammad-elasticsearch:
|
||||||
image: elasticsearch:8.18.0
|
image: elasticsearch:8.19.6
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
@ -82,7 +82,7 @@ services:
|
|||||||
- elasticsearch-data:/usr/share/elasticsearch/data
|
- elasticsearch-data:/usr/share/elasticsearch/data
|
||||||
environment:
|
environment:
|
||||||
discovery.type: single-node
|
discovery.type: single-node
|
||||||
xpack.security.enabled: 'false'
|
xpack.security.enabled: "false"
|
||||||
ES_JAVA_OPTS: -Xms1g -Xmx1g
|
ES_JAVA_OPTS: -Xms1g -Xmx1g
|
||||||
healthcheck:
|
healthcheck:
|
||||||
#test: TODO
|
#test: TODO
|
||||||
@ -100,7 +100,7 @@ services:
|
|||||||
|
|
||||||
zammad-memcached:
|
zammad-memcached:
|
||||||
command: memcached -m 256M
|
command: memcached -m 256M
|
||||||
image: memcached:1.6.38-alpine
|
image: memcached:1.6.39-alpine
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
|
test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@ -134,7 +134,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=3.0.0+6.5.0-34"
|
- "coop-cloud.${STACK_NAME}.version=3.1.1+6.5.2-22"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
||||||
@ -183,9 +183,17 @@ services:
|
|||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 5m
|
start_period: 5m
|
||||||
|
deploy:
|
||||||
|
restart_policy:
|
||||||
|
condition: on-failure
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 4G
|
||||||
|
reservations:
|
||||||
|
memory: 2G
|
||||||
|
|
||||||
zammad-redis:
|
zammad-redis:
|
||||||
image: redis:7.4.3-alpine
|
image: redis:7.4.6-alpine
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
|||||||
Reference in New Issue
Block a user