jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch release/v6.2.0 into master

Browse Source
This commit is contained in:
papacarlo 2021-03-01 08:47:27 +00:00
commit 9dc5f5d993
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

2
Makefile
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 .PHONY: all clean clean-docker deploy docker publish
$(DOCKER_TARGETS): $(DEB_REPO_DATA) $(DOCKER_TARGETS): $(DEB_REPO_DATA)
docker pull ubuntu:20.04
docker build \ docker build \
--build-arg REPO_URL=$(REPO_URL) \ --build-arg REPO_URL=$(REPO_URL) \
--build-arg COMPANY_NAME=$(COMPANY_NAME_LOW) \ --build-arg COMPANY_NAME=$(COMPANY_NAME_LOW) \