diff --git a/docker-compose.yml b/docker-compose.yml index ef6a283..16110b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,14 +25,18 @@ x-shared: ELASTICSEARCH_ENABLED: ELASTICSEARCH_HOST: ELASTICSEARCH_PORT: + ELASTICSEARCH_USER: ${ELASTICSEARCH_USER:-elastic} + ELASTICSEARCH_PASS: ${ELASTICSEARCH_PASS:-zammad} ELASTICSEARCH_SCHEMA: ELASTICSEARCH_NAMESPACE: ELASTICSEARCH_REINDEX: - ELASTICSEARCH_SSL_VERIFY: NGINX_PORT: + NGINX_CLIENT_MAX_BODY_SIZE: NGINX_SERVER_NAME: NGINX_SERVER_SCHEME: RAILS_TRUSTED_PROXIES: + ZAMMAD_HTTP_TYPE: + ZAMMAD_FQDN: ZAMMAD_WEB_CONCURRENCY: ZAMMAD_SESSION_JOBS: ZAMMAD_PROCESS_SCHEDULED: @@ -57,10 +61,18 @@ services: user: 0:0 zammad-elasticsearch: - image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION:-8.16.1} + image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION:-8.18.0} restart: ${RESTART:-always} volumes: - elasticsearch-data:/bitnami/elasticsearch/data + environment: + # Enable authorization without HTTPS. For external access with + # SSL termination, use solutions like nginx-proxy-manager. + ELASTICSEARCH_ENABLE_SECURITY: 'true' + ELASTICSEARCH_SKIP_TRANSPORT_TLS: 'true' + ELASTICSEARCH_ENABLE_REST_TLS: 'false' + # ELASTICSEARCH_USER is hardcoded to 'elastic' in the container. + ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASS:-zammad} zammad-init: <<: *zammad-service @@ -72,12 +84,16 @@ services: zammad-memcached: command: memcached -m 256M - image: memcached:${MEMCACHE_VERSION:-1.6.32-alpine} + image: memcached:${MEMCACHE_VERSION:-1.6.38-alpine} restart: ${RESTART:-always} zammad-nginx: <<: *zammad-service command: ["zammad-nginx"] + expose: + - "${NGINX_PORT:-8080}" + ports: + - "${NGINX_EXPOSE_PORT:-8080}:${NGINX_PORT:-8080}" depends_on: - zammad-railsserver @@ -86,6 +102,7 @@ services: POSTGRES_DB: ${POSTGRES_DB:-zammad_production} POSTGRES_USER: ${POSTGRES_USER:-zammad} POSTGRES_PASSWORD: ${POSTGRES_PASS:-zammad} + # image: postgres:${POSTGRES_VERSION:-17.5-alpine} image: postgres:${POSTGRES_VERSION:-15.6-alpine} restart: ${RESTART:-always} volumes: @@ -96,7 +113,7 @@ services: command: ["zammad-railsserver"] zammad-redis: - image: redis:${REDIS_VERSION:-7.4.1-alpine} + image: redis:${REDIS_VERSION:-7.4.3-alpine} restart: ${RESTART:-always} volumes: - redis-data:/data