Merge branch release/v6.2.0 into master

Add pull ubuntu image (#334 )
Merge pull request #323 from ONLYOFFICE/hotfix/v6.1.1
2026-04-07 14:01:38 +08:00 · 2021-03-01 08:47:27 +00:00 · 2021-02-24 18:34:03 +03:00 · 2020-12-25 11:31:19 +03:00 · 2020-11-09 14:05:04 +03:00 · 2020-11-08 23:38:31 -08:00
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -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 \
--- a/2
+++ b/2
@ -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) \
Author	SHA1	Message	Date
papacarlo	9dc5f5d993	Merge branch release/v6.2.0 into master	2021-03-01 08:47:27 +00:00
Semyon Bezrukov	393006d306	Add pull ubuntu image (#334 )	2021-02-24 18:34:03 +03:00
Alexey Golubev	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
Alexey Golubev	cd02cd6deb	Merge pull request #309 from zhaofengli/netcat-ipv6 Use netcat-openbsd for IPv6 support	2020-11-09 14:05:04 +03:00
Zhaofeng Li	94c64d3f6d	Use netcat-openbsd for IPv6 support	2020-11-08 23:38:31 -08:00
papacarlo	0ed3f8fbbf	Merge branch hotfix/v6.0.1 into develop	2020-10-28 14:31:31 +00:00