mirror of
https://github.com/zokradonh/kopano-docker.git
synced 2026-08-21 21:33:02 +00:00
implement new env variable to disable all automatic actions (#434)
* implement new env variable to disable all automatic actions fixes https://github.com/zokradonh/kopano-docker/issues/360 * wrap the remaining services in checks if autoconfigure/disable_checks is used * move definition of AUTOCONFIGURE variable into base image * add logic to kapps and kdav container * add autoconfigure to konnect container * update build stage to latest golang * add autoconfig to remaining images * delete obsolete apache config in z-push folder * when specifying config paths use KOPANO_CONFIG_PATH * also use env variable in helper scripts * add message about removal of kopano-cli
This commit is contained in:
@@ -2,7 +2,9 @@ ARG CODE_VERSION=1.2.0
|
||||
FROM kopano/kwmserverd:${CODE_VERSION}
|
||||
|
||||
ARG CODE_VERSION
|
||||
ENV CODE_VERSION="${CODE_VERSION}"
|
||||
ENV \
|
||||
AUTOCONFIGURE=true \
|
||||
CODE_VERSION="${CODE_VERSION}"
|
||||
|
||||
LABEL maintainer=az@zok.xyz \
|
||||
org.label-schema.name="Kopano Kwmserver container" \
|
||||
|
||||
+16
-14
@@ -68,21 +68,23 @@ if [ -n "${public_guest_access_regexp:-}" ]; then
|
||||
set -- "$@" --public-guest-access-regexp="$public_guest_access_regexp"
|
||||
fi
|
||||
|
||||
if [ "$INSECURE" = "yes" ]; then
|
||||
dockerize \
|
||||
-skip-tls-verify \
|
||||
-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
|
||||
-timeout 360s
|
||||
else
|
||||
dockerize \
|
||||
-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
|
||||
-timeout 360s
|
||||
fi
|
||||
if [ "${AUTOCONFIGURE}" = true ]; then
|
||||
if [ "$INSECURE" = "yes" ]; then
|
||||
dockerize \
|
||||
-skip-tls-verify \
|
||||
-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
|
||||
-timeout 360s
|
||||
else
|
||||
dockerize \
|
||||
-wait "$oidc_issuer_identifier"/.well-known/openid-configuration \
|
||||
-timeout 360s
|
||||
fi
|
||||
|
||||
# services need to be aware of the machine-id
|
||||
dockerize \
|
||||
-wait file:///etc/machine-id \
|
||||
-wait file:///var/lib/dbus/machine-id
|
||||
# services need to be aware of the machine-id
|
||||
dockerize \
|
||||
-wait file:///etc/machine-id \
|
||||
-wait file:///var/lib/dbus/machine-id
|
||||
fi
|
||||
|
||||
registration_conf=${registration_conf:-/etc/kopano/kwmserverd-registration.yaml}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user