1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-22 13:52:56 +00:00

use onbuild to specify building of core repository only in one place

remove ca-certificates and git from kdav image

git should not be needed since kdav has a builder stage
ca-certificates is already installed in an earlier stage

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels
2019-10-11 14:05:47 +02:00
parent afce634efa
commit 4028b53c78
6 changed files with 11 additions and 28 deletions
+1 -10
View File
@@ -32,17 +32,10 @@ LABEL maintainer=az@zok.xyz \
org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
org.label-schema.schema-version="1.0"
# install Kopano kDAV and refresh ca-certificates
# install Kopano kDAV
RUN \
# community download and package as apt source repository
. /kopano/helper/create-kopano-repo.sh && \
if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
dl_and_package_community "core"; \
fi; \
echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
set -x && \
#apt-get update && apt-get -s -o Debug::pkgProblemResolver=yes install php7-mapi && \
apt-get update && apt-get -s -o Debug::pkgProblemResolver=yes install libkcutil0 && \
apt-get update && apt-get install -y --no-install-recommends \
apache2 \
libapache2-mod-php7.3 \
@@ -53,8 +46,6 @@ RUN \
php-zip \
sqlite \
php-sqlite3 \
ca-certificates \
git \
unzip \
${ADDITIONAL_KOPANO_PACKAGES} \
&& rm -rf /var/cache/apt /var/lib/apt/lists/*