mirror of
https://github.com/zokradonh/kopano-docker.git
synced 2026-08-21 21:33:02 +00:00
update to Debian Buster (#253)
* update to Debian Buster * update webapp container * update kdav image to buster * add some debug commands * 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 * upgrade to Debian 10 for Z-Push * switch remaining Debian 9 repos in webapp * use a new major version for the base image * since its now based on buster * add new parameters to the onbuild step * update repos in setup.sh * switch default distribution in create repo script
This commit is contained in:
+5
-9
@@ -13,7 +13,7 @@ ARG KOPANO_CORE_VERSION=newest
|
||||
ENV \
|
||||
ADDITIONAL_KOPANO_PACKAGES=$ADDITIONAL_KOPANO_PACKAGES \
|
||||
DOWNLOAD_COMMUNITY_PACKAGES=$DOWNLOAD_COMMUNITY_PACKAGES \
|
||||
DOWNLOAD_DISTRIBUTION="Debian_9.0" \
|
||||
DOWNLOAD_DISTRIBUTION="Debian_10" \
|
||||
DOWNLOAD_CHANNEL="community" \
|
||||
DOWNLOAD_BRANCH="" \
|
||||
KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \
|
||||
@@ -39,11 +39,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
# install Kopano Core and refresh ca-certificates
|
||||
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" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \
|
||||
fi; \
|
||||
# apt key has already been installed in base
|
||||
echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
|
||||
# install
|
||||
@@ -65,9 +60,10 @@ RUN \
|
||||
set +x && \
|
||||
rm -rf /var/cache/apt /var/lib/apt/lists && \
|
||||
touch /etc/kopano/admin.cfg && \
|
||||
cp /usr/share/doc/kopano/example-config/*.cfg /etc/kopano/ && \
|
||||
cp /usr/share/doc/kopano/example-config/*.cfg.gz /etc/kopano/ && \
|
||||
gzip -d -f /etc/kopano/*.gz
|
||||
# with 9.0 config files are once again in /etc/kopano
|
||||
(cp /usr/share/doc/kopano/example-config/*.cfg /etc/kopano/ || true) && \
|
||||
(cp /usr/share/doc/kopano/example-config/*.cfg.gz /etc/kopano/ || true) && \
|
||||
(gzip -d -f /etc/kopano/*.gz || true)
|
||||
|
||||
ENV LANG=en_US.UTF-8
|
||||
|
||||
|
||||
Reference in New Issue
Block a user