Compare commits

...

9 Commits

Author SHA1 Message Date
2f26cea790 Fix #347 (#349) 2021-04-01 10:07:07 +03:00
9dc5f5d993 Merge branch release/v6.2.0 into master 2021-03-01 08:47:27 +00:00
393006d306 Add pull ubuntu image (#334) 2021-02-24 18:34:03 +03:00
cbff89bdea Merge pull request #323 from ONLYOFFICE/hotfix/v6.1.1
Merge hotfix/v6.1.1 into release/v6.2.0
2020-12-25 11:31:19 +03:00
93740b7c37 Merge branch release/v6.1.0 into master 2020-12-08 07:07:57 +00:00
4cc63380f2 Merge branch release/v6.1.0 into master 2020-12-01 07:51:32 +00:00
cd02cd6deb Merge pull request #309 from zhaofengli/netcat-ipv6
Use netcat-openbsd for IPv6 support
2020-11-09 14:05:04 +03:00
94c64d3f6d Use netcat-openbsd for IPv6 support 2020-11-08 23:38:31 -08:00
0ed3f8fbbf Merge branch hotfix/v6.0.1 into develop 2020-10-28 14:31:31 +00:00
3 changed files with 3 additions and 3 deletions

View File

@ -34,7 +34,7 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
mysql-client \
nano \
net-tools \
netcat \
netcat-openbsd \
nginx-extras \
postgresql \
postgresql-client \

View File

@ -38,7 +38,7 @@ DOCKER_ARCH := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW)_$(PACKAGE_VERSION).tar.gz
.PHONY: all clean clean-docker deploy docker publish
$(DOCKER_TARGETS): $(DEB_REPO_DATA)
docker pull ubuntu:20.04
docker build \
--build-arg REPO_URL=$(REPO_URL) \
--build-arg COMPANY_NAME=$(COMPANY_NAME_LOW) \

View File

@ -107,7 +107,7 @@ When using CA certified certificates (e.g [Let's encrypt](https://letsencrypt.or
#### Using the automatically generated Let's Encrypt SSL Certificates
sudo docker run -i -t -d -p 443:443 \
sudo docker run -i -t -d -p 80:80 -p 443:443 \
-e LETS_ENCRYPT_DOMAIN=your_domain -e LETS_ENCRYPT_MAIL=your_mail onlyoffice/documentserver
If you want to get and extend Let's Encrypt SSL Certificates automatically just set LETS_ENCRYPT_DOMAIN and LETS_ENCRYPT_MAIL variables.