flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-23 22:32:52 +00:00
Code Issues Releases Wiki Activity

final changes

Browse Source 
Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels
2020-02-25 13:05:31 +01:00
parent 0d6477c45a
commit 2afb65303a
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -1
View File
@@ -280,7 +280,9 @@ publish-container: ## Helper target to push a given image to a registry. Default
version=$${version%.*} ; \ version=$${version%.*} ; \
docker push $(docker_repo)/kopano_$(component):$$version ; \ docker push $(docker_repo)/kopano_$(component):$$version ; \
done done
#docker push $(docker_repo)/kopano_$(component):latest ifdef PUBLISHLATEST
docker push $(docker_repo)/kopano_$(component):latest
endif
#ifdef DOCKERREADME #ifdef DOCKERREADME
# bash .ci/docker-hub-helper.sh $(component) # bash .ci/docker-hub-helper.sh $(component)
#endif #endif
base/Dockerfile
+3 -2
View File
@@ -12,7 +12,8 @@ ARG RELEASE_KEY_DOWNLOAD=0
ARG KOPANO_UID=999 ARG KOPANO_UID=999
ARG KOPANO_GID=999 ARG KOPANO_GID=999
ENV BASE_VERSION=2.0.0 \ ENV \
BASE_VERSION=2.0.0 \
DEBUG="" \ DEBUG="" \
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
@@ -87,4 +88,4 @@ ONBUILD RUN \
. /kopano/helper/create-kopano-repo.sh && \ . /kopano/helper/create-kopano-repo.sh && \
if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \ if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
dl_and_package_community "core" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \ dl_and_package_community "core" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \
fi fi
docker-compose.mail.yml
+2 -2
View File
@@ -4,8 +4,8 @@ services:
mail: mail:
image: tvial/docker-mailserver:release-v6.2.0 image: tvial/docker-mailserver:release-v6.2.0
restart: unless-stopped restart: unless-stopped
#hostname: mail hostname: mail
#domainname: ${LDAP_DOMAIN} domainname: ${LDAP_DOMAIN}
container_name: ${COMPOSE_PROJECT_NAME}_mail container_name: ${COMPOSE_PROJECT_NAME}_mail
ports: ports:
- "${SMTPPORT:-25}:25" - "${SMTPPORT:-25}:25"
docker-compose.yml
+2 -2
View File
@@ -257,8 +257,8 @@ services:
image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
read_only: true read_only: true
restart: unless-stopped restart: unless-stopped
#hostname: spooler hostname: spooler
#domainname: ${LDAP_DOMAIN} domainname: ${LDAP_DOMAIN}
depends_on: depends_on:
- kopano_server - kopano_server
volumes: volumes:
setup.sh
+3
View File
@@ -339,6 +339,9 @@ COMPOSE_FILE=docker-compose.yml:docker-compose.ports.yml:docker-compose.db.yml:d
#RELEASE_KEY_DOWNLOAD=1 #RELEASE_KEY_DOWNLOAD=1
#DOWNLOAD_COMMUNITY_PACKAGES=0 #DOWNLOAD_COMMUNITY_PACKAGES=0
# Remove this variable to not push versioned containers with the :latest tag
PUBLISHLATEST=yes
# Additional packages to install # Additional packages to install
ADDITIONAL_KOPANO_PACKAGES="" ADDITIONAL_KOPANO_PACKAGES=""
ADDITIONAL_KOPANO_WEBAPP_PLUGINS="$ADDITIONAL_KOPANO_WEBAPP_PLUGINS" ADDITIONAL_KOPANO_WEBAPP_PLUGINS="$ADDITIONAL_KOPANO_WEBAPP_PLUGINS"