1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-08 16:36:19 +00:00

Minor changes

This commit is contained in:
Andre Zoledziowski 2018-07-01 12:16:53 +02:00
parent d535895cdc
commit 44eb4c8f52
No known key found for this signature in database
GPG Key ID: 2A72044119624966
3 changed files with 303 additions and 288 deletions

View File

@ -28,7 +28,7 @@ services:
- KCCONF_SERVER_MYSQL_HOST=db - KCCONF_SERVER_MYSQL_HOST=db
- KCCONF_SERVER_MYSQL_PORT=3306 - KCCONF_SERVER_MYSQL_PORT=3306
- KCCONF_SERVER_MYSQL_DATABASE=kopano - KCCONF_SERVER_MYSQL_DATABASE=kopano
- KCCONF_SERVER_MYSQL_USERNAME=root - KCCONF_SERVER_MYSQL_USER=root
- KCCONF_SERVER_MYSQL_PASSWORD=YOUR_MYSQL_ROOT_PASSWORD #change here - KCCONF_SERVER_MYSQL_PASSWORD=YOUR_MYSQL_ROOT_PASSWORD #change here
- KCCONF_SERVER_SERVER_SSL_KEY_FILE=/kopano/ssl/kserver.pem - KCCONF_SERVER_SERVER_SSL_KEY_FILE=/kopano/ssl/kserver.pem
- KCCONF_SERVER_SERVER_SSL_CA_FILE=/kopano/ssl/ca.pem - KCCONF_SERVER_SERVER_SSL_CA_FILE=/kopano/ssl/ca.pem

View File

@ -8,18 +8,21 @@ networkname="buildproxy_net"
customBuildArgs=() customBuildArgs=()
serial="" serial=""
component="" component=""
proxyContainerId=""
nocache=""
function _usage() function _usage()
{ {
echo "Usage: build.sh -c core|webapp [-s serial] [-b master|final|pre-final] [-p buildcontext] [-n networkname] [[-a buildarg] ...]" echo "Usage: build.sh -c core|webapp [-s serial] [-b master|final|pre-final] [-p buildcontext] [-n networkname] [[-a buildarg] ...] [-i]"
echo "Example: build.sh -c core -s ABC123456789DEF -b final" echo "Example: build.sh -c core -s ABC123456789DEF -b final"
echo "If no branch is specified, 'master' will be built by default." echo "-i Do not use cache on docker build."
echo "If no buildcontext is specified, it will be built from git repository. Normally, you do not need to specify this." echo "-b If no branch is specified, 'master' will be built by default."
echo "If no networkname is specified, it will create and use a network named 'buildproxy_net'." echo "-p If no buildcontext is specified, it will be built from git repository. Normally, you do not need to specify this."
echo "You can specify custom build args via e.g. -a KOPANO_CORE_REPOSITORY_URL=http://thisismy/url -a KOPANO_WEBAPP_REPOSITORY_URL=http://thisismy/url." echo "-n If no networkname is specified, it will create and use a network named 'buildproxy_net'."
echo "-a You can specify custom build args via e.g. -a KOPANO_CORE_REPOSITORY_URL=http://thisismy/url -a KOPANO_WEBAPP_REPOSITORY_URL=http://thisismy/url."
} }
while getopts ":s:c:b:p:n:a:" opt; do while getopts ":s:c:b:p:n:a:i" opt; do
case $opt in case $opt in
s) s)
serial=$OPTARG serial=$OPTARG
@ -39,6 +42,9 @@ while getopts ":s:c:b:p:n:a:" opt; do
a) a)
customBuildArgs[${#customBuildArgs[*]}]=$OPTARG customBuildArgs[${#customBuildArgs[*]}]=$OPTARG
;; ;;
i)
nocache="--no-cache"
;;
\?) \?)
_usage _usage
exit 1 exit 1
@ -118,6 +124,7 @@ docker build \
--build-arg KOPANO_${component^^}_VERSION=$currentVersion \ --build-arg KOPANO_${component^^}_VERSION=$currentVersion \
$customBuildString \ $customBuildString \
$tagLatest \ $tagLatest \
$nocache \
-t zokradonh/kopano_$component:$currentVersionDocker \ -t zokradonh/kopano_$component:$currentVersionDocker \
-t zokradonh/kopano_$component:latest-$branch \ -t zokradonh/kopano_$component:latest-$branch \
--network $networkname \ --network $networkname \

View File

@ -19,6 +19,14 @@ chown -R kopano:kopano /kopano/data /run /tmp
echo "Clean old pid files and sockets" | ts echo "Clean old pid files and sockets" | ts
rm -f /var/run/kopano/* rm -f /var/run/kopano/*
# allow helper commands given by "docker-compose run"
if [ $# -gt 0 ]
then
exec "$@"
exit
fi
# start regular service
case "$SERVICE_TO_START" in case "$SERVICE_TO_START" in
server) server)
exec /usr/sbin/kopano-server -F exec /usr/sbin/kopano-server -F