From 143c87272f912c35ff36527dbc0a21f90853dd51 Mon Sep 17 00:00:00 2001 From: Jan-NiklasB <44967908+Jan-NiklasB@users.noreply.github.com> Date: Tue, 17 Sep 2024 13:22:07 +0000 Subject: [PATCH 1/2] Add LETSENCRYPT_HOST and VIRTUAL_HOST vars to file Adding the two environment variables to the stack to allow the usage with jwilder/nginx-proxy and jrcs/letsencrypt-nginx-proxy-companion with Portainer via repo-pull --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 11aef0c..338d01a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,10 +28,12 @@ x-shared: ELASTICSEARCH_NAMESPACE: ELASTICSEARCH_REINDEX: ELASTICSEARCH_SSL_VERIFY: + LETSENCRYPT_HOST: NGINX_PORT: NGINX_SERVER_NAME: NGINX_SERVER_SCHEME: RAILS_TRUSTED_PROXIES: + VIRTUAL_HOST: ZAMMAD_WEB_CONCURRENCY: ZAMMAD_SESSION_JOBS: ZAMMAD_PROCESS_SCHEDULED: From f9e5bc8d646d4c8d48d2139aa30364f7e85047ae Mon Sep 17 00:00:00 2001 From: Jan-NiklasB <44967908+Jan-NiklasB@users.noreply.github.com> Date: Fri, 17 Jan 2025 15:38:57 +0100 Subject: [PATCH 2/2] Rearranged env-vars, added description and additional vars Put the ngingx proxy and ACME-companion vars at the end, added a description and missing vars --- docker-compose.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5a61b0e..1669cd4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,17 +29,24 @@ x-shared: ELASTICSEARCH_NAMESPACE: ELASTICSEARCH_REINDEX: ELASTICSEARCH_SSL_VERIFY: - LETSENCRYPT_HOST: NGINX_PORT: NGINX_CLIENT_MAX_BODY_SIZE: NGINX_SERVER_NAME: NGINX_SERVER_SCHEME: RAILS_TRUSTED_PROXIES: - VIRTUAL_HOST: ZAMMAD_WEB_CONCURRENCY: ZAMMAD_SESSION_JOBS: ZAMMAD_PROCESS_SCHEDULED: ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: + # Variables used by ngingx-proxy container for reverse proxy creations + # for docs refer to https://github.com/nginx-proxy/nginx-proxy + VIRTUAL_HOST: + VIRTUAL_PORT: + # Variables used by acme-companion for retrieval of LetsEncrypt certificate + # for docs refer to https://github.com/nginx-proxy/acme-companion + LETSENCRYPT_HOST: + LETSENCRYPT_EMAIL: + image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.4.1-29} restart: ${RESTART:-always} volumes: