mirror of
https://github.com/zokradonh/kopano-docker
synced 2025-06-08 16:36:19 +00:00
some more shellcheck
fixes #41 Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
parent
b21beb96c2
commit
94a2b3ad12
@ -1,7 +1,10 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
if [ ! $(id -u) -eq 0 ]; then
|
if [ ! "$(id -u)" -eq 0 ]; then
|
||||||
echo "This script may need to be run as root to be able to use docker/docker-compose through it."
|
echo "This script may need to be run as root to be able to use docker/docker-compose through it."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
docker run \
|
docker run \
|
||||||
--rm -it \
|
--rm -it \
|
||||||
-u $(id -u ${USER}):$(id -g ${USER}) \
|
-u $(id -u ${USER}):$(id -g ${USER}) \
|
||||||
|
@ -9,7 +9,7 @@ dockerize \
|
|||||||
konnectd serve \
|
konnectd serve \
|
||||||
--signing-private-key=/kopano/ssl/konnectd-tokens-signing-key.pem \
|
--signing-private-key=/kopano/ssl/konnectd-tokens-signing-key.pem \
|
||||||
--encryption-secret=/kopano/ssl/konnectd-encryption.key \
|
--encryption-secret=/kopano/ssl/konnectd-encryption.key \
|
||||||
--iss=https://$FQDN \
|
--iss=https://"$FQDN" \
|
||||||
--identifier-registration-conf /etc/kopano/konnectd-identifier-registration.yaml \
|
--identifier-registration-conf /etc/kopano/konnectd-identifier-registration.yaml \
|
||||||
--identifier-scopes-conf /etc/kopano/konnectd-identifier-scopes.yaml \
|
--identifier-scopes-conf /etc/kopano/konnectd-identifier-scopes.yaml \
|
||||||
kc
|
kc
|
||||||
|
@ -4,13 +4,13 @@ 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
|
||||||
|
|
||||||
echo "Configure service '$SERVICE_TO_START'" | ts
|
echo "Configure service '$SERVICE_TO_START'" | ts
|
||||||
/usr/bin/python3 /kopano/$SERVICE_TO_START.py
|
/usr/bin/python3 /kopano/"$SERVICE_TO_START".py
|
||||||
|
|
||||||
# allow helper commands given by "docker-compose run"
|
# allow helper commands given by "docker-compose run"
|
||||||
if [ $# -gt 0 ]; then
|
if [ $# -gt 0 ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user