flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 02:17:47 +00:00
Code Issues Releases Wiki Activity

shellcheck for webapp

Browse Source 
Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2019-02-26 16:52:56 +01:00
parent b8cb5f720d
commit b21beb96c2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/start-service.sh
View File

@ -4,29 +4,29 @@ ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
set -eu # unset variables are errors & non-zero return values exit the whole script set -eu # unset variables are errors & non-zero return values exit the whole script
if [ ! -e /kopano/$SERVICE_TO_START.py ]; then if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then
echo "Invalid service specified: $SERVICE_TO_START" | ts echo "Invalid service specified: $SERVICE_TO_START" | ts
exit 1 exit 1
fi fi
[ ! -z "$ADDITIONAL_KOPANO_PACKAGES" ] && apt update [ ! -z "$ADDITIONAL_KOPANO_PACKAGES" ] && apt update
[ ! -z "$ADDITIONAL_KOPANO_PACKAGES" ] && for installpkg in "$ADDITIONAL_KOPANO_PACKAGES"; do [ ! -z "$ADDITIONAL_KOPANO_PACKAGES" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do
if [ $(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c "ok installed") -eq 0 ]; then if [ $(dpkg-query -W -f='${Status}' "$installpkg" 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
apt --assume-yes install $installpkg; apt --assume-yes install "$installpkg";
fi fi
done done
mkdir -p /kopano/data/attachments /kopano/data/kapi-kvs /tmp/$SERVICE_TO_START /var/run/kopano mkdir -p /kopano/data/attachments /kopano/data/kapi-kvs /tmp/"$SERVICE_TO_START" /var/run/kopano
echo "Configure core service '$SERVICE_TO_START'" | ts echo "Configure core service '$SERVICE_TO_START'" | ts
/usr/bin/python3 /kopano/$SERVICE_TO_START.py /usr/bin/python3 /kopano/"$SERVICE_TO_START".py
echo "Set ownership" | ts echo "Set ownership" | ts
chown -R kopano:kopano /run /tmp chown -R kopano:kopano /run /tmp
chown kopano:kopano /kopano/data/ /kopano/data/attachments chown kopano:kopano /kopano/data/ /kopano/data/attachments
# ensure removed pid-file on unclean shutdowns and mounted volumes # ensure removed pid-file on unclean shutdowns and mounted volumes
rm -f /var/run/kopano/$SERVICE_TO_START.pid rm -f /var/run/kopano/"$SERVICE_TO_START".pid
# allow helper commands given by "docker-compose run" # allow helper commands given by "docker-compose run"
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
@ -40,8 +40,8 @@ server)
/kopano/services/kopano-public-store.sh & /kopano/services/kopano-public-store.sh &
/kopano/services/kopano-users.sh & /kopano/services/kopano-users.sh &
dockerize \ dockerize \
-wait file://$KCCONF_SERVER_SERVER_SSL_CA_FILE \ -wait file://"$KCCONF_SERVER_SERVER_SSL_CA_FILE" \
-wait file://$KCCONF_SERVER_SERVER_SSL_KEY_FILE \ -wait file://"$KCCONF_SERVER_SERVER_SSL_KEY_FILE" \
-wait tcp://db:3306 \ -wait tcp://db:3306 \
-timeout 360s -timeout 360s
# cleaning up env variables # cleaning up env variables
@ -75,8 +75,8 @@ ical)
grapi) grapi)
LC_CTYPE=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
export socket_path=/var/run/kopano/grapi export socket_path=/var/run/kopano/grapi
mkdir -p $socket_path mkdir -p "$socket_path"
chown -R kapi:kopano $socket_path chown -R kapi:kopano "$socket_path"
# cleaning up env variables # cleaning up env variables
unset "${!KCCONF_@}" unset "${!KCCONF_@}"
exec kopano-grapi serve exec kopano-grapi serve

8
webapp/start.sh
View File

@ -10,10 +10,10 @@ set -eu # unset variables are errors & non-zero return values exit the whole scr
ADDITIONAL_KOPANO_PACKAGES="$ADDITIONAL_KOPANO_PACKAGES $ADDITIONAL_KOPANO_WEBAPP_PLUGINS" ADDITIONAL_KOPANO_PACKAGES="$ADDITIONAL_KOPANO_PACKAGES $ADDITIONAL_KOPANO_WEBAPP_PLUGINS"
[ ! -z ${ADDITIONAL_KOPANO_PACKAGES// } ] && apt update [ ! -z "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update
[ ! -z ${ADDITIONAL_KOPANO_PACKAGES// } ] && for installpkg in "$ADDITIONAL_KOPANO_PACKAGES"; do [ ! -z "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do
if [ $(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c "ok installed") -eq 0 ]; then if [ $(dpkg-query -W -f='${Status}' "$installpkg" 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
apt --assume-yes install $installpkg; apt --assume-yes install "$installpkg"
fi fi
done done