diff --git a/Dockerfile b/Dockerfile index 8d8b2c2..0f1fc9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,8 @@ ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=nonint ARG ONLYOFFICE_VALUE=onlyoffice RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \ + export http_proxy=http://newhome.picroup.com:1087 && \ + export https_proxy=http://newhome.picroup.com:1087 && \ apt-get -y update && \ apt-get -yq install wget apt-transport-https gnupg locales && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0x8320ca65cb2de8e5 && \ diff --git a/docker-compose.yml b/docker-compose.yml index 51fafb2..bf6c62d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: onlyoffice-documentserver: build: context: . - container_name: onlyoffice-documentserver + container_name: office depends_on: - onlyoffice-postgresql - onlyoffice-rabbitmq @@ -20,18 +20,23 @@ services: #- JWT_HEADER=Authorization #- JWT_IN_BODY=true ports: - - '80:80' - - '443:443' + - '40006:80' stdin_open: true restart: always stop_grace_period: 60s volumes: - - /var/www/onlyoffice/Data - - /var/log/onlyoffice - - /var/lib/onlyoffice/documentserver/App_Data/cache/files - - /var/www/onlyoffice/documentserver-example/public/files - - /usr/share/fonts - + - /var/www/onlyoffice/Data + - /var/log/onlyoffice + - /var/lib/onlyoffice/documentserver/App_Data/cache/files + - /var/www/onlyoffice/documentserver-example/public/files + - /usr/share/fonts + labels: + - "traefik.enable=true" + - "traefik.http.routers.office.rule=Host(`office.jianzhi.group`)" + - "traefik.http.routers.office.entrypoints=websecure" + - "traefik.http.routers.office.tls.certresolver=myresolver" + - "traefik.http.services.office.loadbalancer.server.port=40006" + onlyoffice-rabbitmq: container_name: onlyoffice-rabbitmq image: rabbitmq