Merge branch release/v6.2.0 into master

2021-03-01 08:47:27 +00:00 · 2021-03-01 08:47:27 +00:00 · 9dc5f5d993
parent 93740b7c37 393006d306
commit 9dc5f5d993
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) \