From fe6566c4273e48316f42f77cf9e24101cbfa320e Mon Sep 17 00:00:00 2001 From: mlan Date: Sat, 26 Jun 2021 12:46:12 +0200 Subject: [PATCH] - [docker](Dockerfile) Update Z-Push package URL. - [kopano](src/kopano) Now use ubuntu:20.04 in `kopano-webaddr.sh`. --- CHANGELOG.md | 6 ++++++ Dockerfile | 2 +- src/kopano/bin/kopano-webaddr.sh | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 565ea33..016fa47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.3.1 + +- [docker](Dockerfile) Update Z-Push package URL. +- [kopano](src/kopano) Now use ubuntu:20.04 in `kopano-webaddr.sh`. +- [docker](ROADMAP.md) Update roadmap. + # 1.3.0 - [docker](Dockerfile) Now use ubuntu:20.04 as base image. diff --git a/Dockerfile b/Dockerfile index 9152f08..4e61112 100644 --- a/Dockerfile +++ b/Dockerfile @@ -236,7 +236,7 @@ ENV DEBIAN_FRONTEND=noninteractive \ # # Add Z-Push repository and install Z-Push configured to be used with Kopano and Apache # -RUN debaddr="$(kopano-webaddr.sh --deb final http://repo.z-hub.io/z-push: ${DIST} ${REL})" \ +RUN debaddr="$(kopano-webaddr.sh --deb final https://download.kopano.io/zhub/z-push: ${DIST} ${REL})" \ && echo "deb $debaddr/ /" > /etc/apt/sources.list.d/z-push.list \ && wget -qO - $debaddr/Release.key | apt-key add - \ && mkdir -p /var/lib/z-push && chown www-data: /var/lib/z-push \ diff --git a/src/kopano/bin/kopano-webaddr.sh b/src/kopano/bin/kopano-webaddr.sh index f8b29ea..c4f1afe 100755 --- a/src/kopano/bin/kopano-webaddr.sh +++ b/src/kopano/bin/kopano-webaddr.sh @@ -8,8 +8,8 @@ _webroot="https://download.kopano.io/community" _debroot="http://repo.z-hub.io/z-push:" _component="core" _stage="final" -_dist="debian" -_rel="9" +_dist="ubuntu" +_rel="20.04" _arch="amd64" #