From 21f2911eea3240b5500932991c1ba3a1b6838d90 Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Tue, 16 Jul 2019 10:59:32 -0700 Subject: [PATCH] Split examples for nginx-proxy and traefik --- README.md | 5 ++- ...ose.yml => docker-compose.yml.nginx-proxy} | 0 examples/docker-compose.yml.traefik | 44 +++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) rename examples/{docker-compose.yml => docker-compose.yml.nginx-proxy} (100%) create mode 100644 examples/docker-compose.yml.traefik diff --git a/README.md b/README.md index 8b2bb91..c5578bd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ This will build a container for [LibreOffice Online](https://libreoffice.org/) f * Configurable Concurrent User and Document Limit (set to generarous values by default) * Set features to support autogeneration of TLS certificates/activate reverse proxy support, others.. -* * Zabbix Monitoring of Active Documents, Users, Memory Consumed [Changelog](CHANGELOG.md) @@ -78,6 +77,8 @@ The following directories should be mapped for persistent storage in order to ut |-----------|-------------| | `/var/log/loolwsd` | Log files | `/assets/custom` | If you want to update the theme of LibreOffice online, dropping files in here will overwrite /opt/lool/share on startup | +| `/etc/loolwsd/certs` | (Optional) If you would like to use your own certificates, map this volume and set appropriate variables | + ### Environment Variables Along with the Environment Variables from the [Base image](https://hub.docker.com/r/tiredofit/debian), below is the complete list of available options that can be used to customize your installation. @@ -92,7 +93,7 @@ Along with the Environment Variables from the [Base image](https://hub.docker.co | `ENABLE_TLS` | Enable TLS - Default: `TRUE` | `ENABLE_TLS_CERT_GENERATE` | Enable Self Signed Certificate Generation (Default: `TRUE`) | `ENABLE_TLS_REVERSE_PROXY` | If using a Reverse SSL terminating proxy in front of this container (Default: `FALSE`) -| `TLS_CERT_PATH` | TLS certificates path - Default: `/etc/loolwsd/certs` +| `TLS_CERT_PATH` | TLS certificates path - Default: `/etc/loolwsd/certs` | | `TLS_CA_FILENAME` | TLS CA Cert filename with extension - Default: `ca-chain-cert.pem` | | `TLS_CERT_FILENAME` | TLS Certificate filename with extension - Default: `cert.pem` | |`TLS_KEY_FILENAME` | TLS Private Key filename with extension - Default: `key.pem` | diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml.nginx-proxy similarity index 100% rename from examples/docker-compose.yml rename to examples/docker-compose.yml.nginx-proxy diff --git a/examples/docker-compose.yml.traefik b/examples/docker-compose.yml.traefik new file mode 100644 index 0000000..9b71062 --- /dev/null +++ b/examples/docker-compose.yml.traefik @@ -0,0 +1,44 @@ +version: '3.7' +services: + + libreoffice-online-app: + image: tiredofit/libreoffice-online + container_name: libreoffice-online-app + hostname: libreoffice + domainname: example.com + expose: + - 9980 + cap_add: + - MKNOD + - NET_ADMIN + privileged: true + labels: + - traefik.enable=true + - traefik.frontend.rule=Host:libreoffice.example.com + - traefik.port=9980 + - traefik.protocol=http + - traefik.docker.network=proxy + - traefik.backend=libreoffice-online-app + volumes: + - ./logs:/var/log/lool + environment: + - ZABBIX_HOSTNAME=libreoffice-online-app + + - ADMIN_USER=admin + - ADMIN_PASS=libreoffice + + - ALLOWED_HOSTS=^(.*)\.example\.org + + - ENABLE_TLS=FALSE + - ENABLE_TLS_REVERSE_PROXY=TRUE + networks: + - proxy + - services + restart: always + +networks: + proxy: + external: true + services: + external: true +