flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-30 18:07:46 +00:00
Code Issues Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Andre Zoledziowski 2018-10-13 14:32:11 +02:00
commit 30fc849f6a
No known key found for this signature in database
GPG Key ID: 2A72044119624966
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Dockerfile
View File

@ -43,6 +43,7 @@ COPY --from=common /common.sh /kopano/helper/
SHELL [ "/bin/bash", "-c"] SHELL [ "/bin/bash", "-c"]
RUN \ RUN \
<<<<<<< HEAD
# community download and package as apt source repository # community download and package as apt source repository
. /kopano/helper/common.sh && \ . /kopano/helper/common.sh && \
if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \ if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
@ -57,6 +58,11 @@ RUN \
if [ ${RELEASE_KEY_DOWNLOAD} -eq 1 ]; then \ if [ ${RELEASE_KEY_DOWNLOAD} -eq 1 ]; then \
curl -s -S -o - "${KOPANO_CORE_REPOSITORY_URL}/Release.key" | apt-key add -; \ curl -s -S -o - "${KOPANO_CORE_REPOSITORY_URL}/Release.key" | apt-key add -; \
fi; \ fi; \
=======
# community download
[ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ] && \
/kopano/download_community.sh core; \
>>>>>>> e6766f261f54d575dbef21af400319f27583d5c0
# install # install
apt-get update && \ apt-get update && \
set -x && \ set -x && \

15
webapp/Dockerfile
View File

@ -42,6 +42,7 @@ SHELL [ "/bin/bash", "-c"]
# install kopano web app and refresh ca-certificates # install kopano web app and refresh ca-certificates
RUN \ RUN \
<<<<<<< HEAD
# community download and package as apt source repository # community download and package as apt source repository
. /kopano/helper/common.sh && \ . /kopano/helper/common.sh && \
if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \ if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
@ -61,6 +62,20 @@ RUN \
curl -s -S -o - "${KOPANO_WEBAPP_REPOSITORY_URL}/Release.key" | apt-key add -; \ curl -s -S -o - "${KOPANO_WEBAPP_REPOSITORY_URL}/Release.key" | apt-key add -; \
fi; \ fi; \
# prepare z-push installation # prepare z-push installation
=======
# community download
[ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ] && \
/kopano/download_community.sh core && \
/kopano/download_community.sh webapp; \
# install
set -x && \
echo ${KOPANO_CORE_VERSION} > /kopano/buildversion && \
echo ${KOPANO_WEBAPP_VERSION} >> /kopano/buildversion && \
echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano-core.list; \
[ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 0 ] && echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_WEBAPP_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano-webapp.list; \
[ ${RELEASE_KEY_DOWNLOAD} -eq 1 ] && curl -s -S -o - "${KOPANO_CORE_REPOSITORY_URL}/Release.key" | apt-key add -; \
[ ${RELEASE_KEY_DOWNLOAD} -eq 1 ] && curl -s -S -o - "${KOPANO_WEBAPP_REPOSITORY_URL}/Release.key" | apt-key add -; \
>>>>>>> e6766f261f54d575dbef21af400319f27583d5c0
echo "deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /" > /etc/apt/sources.list.d/zpush.list && \ echo "deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /" > /etc/apt/sources.list.d/zpush.list && \
curl -s -S -o - "http://repo.z-hub.io/z-push:/final/Debian_9.0/Release.key" | apt-key add - && \ curl -s -S -o - "http://repo.z-hub.io/z-push:/final/Debian_9.0/Release.key" | apt-key add - && \
# install # install