From 94c64d3f6d72af477df2c4ee606aa3d843f6e034 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sat, 7 Nov 2020 13:50:00 -0800
Subject: [PATCH 1/2] Use netcat-openbsd for IPv6 support
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 672bc47..2a52019 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,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 \
From 393006d3064f1768b22d30c009a28523be512e4c Mon Sep 17 00:00:00 2001
From: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
Date: Wed, 24 Feb 2021 18:34:03 +0300
Subject: [PATCH 2/2] Add pull ubuntu image (#334)
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index fad186b..3021df3 100644
--- a/Makefile
+++ b/Makefile
@@ -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) \