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

Cure some quoting issues

Browse Source 
* Double quotes not needed by docker compose

Same issue as here https://github.com/zokradonh/kopano-docker/issues/216

* move deletion of tmpfile into an exit trap

otherwise the file is not cleaned up when supported images are built

* repair sourcing of env by removing kopano ldap settings from env before sourcing

* additional packages env vars should be quoted in .env
* adapt start scripts to handle quotes additional packages
* treat update-tag script with ldap variable fix from setup.sh

fixes #216

* run version.sh in travis (to fail early if something is wrong there)
commit forgotten fixes to start scripts
This commit is contained in:
zokradonh
2019-08-22 09:21:10 +02:00
committed by Felix Bartels
parent b8885da14e
commit b0236bf0d8
8 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup.sh
+4 -4
View File
@@ -282,8 +282,8 @@ SELF_SERVICE_PASSWORD_MIN_DIGIT=1
SELF_SERVICE_PASSWORD_MIN_SPECIAL=1
# switch the value of these two variables to use the activedirectory configuration
KCUNCOMMENT_LDAP_1="!include /usr/share/kopano/ldap.openldap.cfg"
KCCOMMENT_LDAP_1="!include /usr/share/kopano/ldap.active-directory.cfg"
KCUNCOMMENT_LDAP_1=!include /usr/share/kopano/ldap.openldap.cfg
KCCOMMENT_LDAP_1=!include /usr/share/kopano/ldap.active-directory.cfg
MYSQL_HOST=$MYSQL_HOST
MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
@@ -333,8 +333,8 @@ COMPOSE_FILE=docker-compose.yml:docker-compose.ports.yml
#DOWNLOAD_COMMUNITY_PACKAGES=0
# Additional packages to install
ADDITIONAL_KOPANO_PACKAGES=
ADDITIONAL_KOPANO_WEBAPP_PLUGINS=$ADDITIONAL_KOPANO_WEBAPP_PLUGINS
ADDITIONAL_KOPANO_PACKAGES=""
ADDITIONAL_KOPANO_WEBAPP_PLUGINS="$ADDITIONAL_KOPANO_WEBAPP_PLUGINS"
EOF
else