mirror of
https://github.com/zokradonh/kopano-docker.git
synced 2026-08-11 16:32:59 +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:
+14
-2
@@ -1,4 +1,4 @@
|
||||
FROM debian:stretch
|
||||
FROM debian:buster
|
||||
|
||||
ARG VCS_REF
|
||||
ARG ADDITIONAL_KOPANO_PACKAGES=""
|
||||
@@ -13,7 +13,7 @@ ARG KOPANO_UID=999
|
||||
ARG KOPANO_GID=999
|
||||
|
||||
ENV \
|
||||
BASE_VERSION=1.4.0 \
|
||||
BASE_VERSION=2.0.0 \
|
||||
DEBUG="" \
|
||||
DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
@@ -40,6 +40,7 @@ RUN apt-get update && \
|
||||
curl \
|
||||
dumb-init \
|
||||
gpg \
|
||||
gpg-agent \
|
||||
jq \
|
||||
locales \
|
||||
moreutils \
|
||||
@@ -77,3 +78,14 @@ COPY create-kopano-repo.sh /kopano/helper/
|
||||
COPY kcconf.py /kopano/
|
||||
|
||||
SHELL [ "/bin/bash", "-c"]
|
||||
|
||||
ONBUILD ARG DOWNLOAD_COMMUNITY_PACKAGES=1
|
||||
ONBUILD ARG DOWNLOAD_DISTRIBUTION="Debian_10"
|
||||
ONBUILD ARG DOWNLOAD_CHANNEL="community"
|
||||
ONBUILD ARG DOWNLOAD_BRANCH=""
|
||||
ONBUILD 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
|
||||
|
||||
@@ -11,7 +11,7 @@ function version_from_filename {
|
||||
|
||||
function h5ai_query {
|
||||
component=${1:-core}
|
||||
distribution=${2:-Debian_9.0}
|
||||
distribution=${2:-Debian_10}
|
||||
channel=${3:-community} # could either be community, supported or limited
|
||||
branch=${4:-""} # could either be empty, "master/tarballs/", "pre-final/tarballs/" or "final/tarballs/"
|
||||
|
||||
@@ -31,7 +31,7 @@ function h5ai_query {
|
||||
function dl_and_package_community {
|
||||
# take component as first argument and fallback to core if none given
|
||||
component=${1:-core}
|
||||
distribution=${2:-Debian_9.0}
|
||||
distribution=${2:-Debian_10}
|
||||
channel=${3:-community}
|
||||
branch=${4:-""}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user