|
@@ -8,7 +8,6 @@ set -o pipefail
|
|
|
export LC_ALL=C
|
|
export LC_ALL=C
|
|
|
DATE=$(date +%Y-%m-%d_%H_%M_%S)
|
|
DATE=$(date +%Y-%m-%d_%H_%M_%S)
|
|
|
BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
|
BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
|
|
-declare -a DC_PARAMS
|
|
|
|
|
|
|
|
|
|
while (($#)); do
|
|
while (($#)); do
|
|
|
case "${1}" in
|
|
case "${1}" in
|
|
@@ -23,9 +22,6 @@ while (($#)); do
|
|
|
exit 3
|
|
exit 3
|
|
|
fi
|
|
fi
|
|
|
;;
|
|
;;
|
|
|
- --no-start)
|
|
|
|
|
- DC_PARAMS=(${DC_PARAMS[@]} "--no-start")
|
|
|
|
|
- ;;
|
|
|
|
|
--ours)
|
|
--ours)
|
|
|
MERGE_STRATEGY=ours
|
|
MERGE_STRATEGY=ours
|
|
|
;;
|
|
;;
|
|
@@ -198,7 +194,7 @@ cp -n data/assets/ssl-example/*.pem data/assets/ssl/
|
|
|
|
|
|
|
|
echo -e "\e[32mStarting mailcow...\e[0m"
|
|
echo -e "\e[32mStarting mailcow...\e[0m"
|
|
|
sleep 2
|
|
sleep 2
|
|
|
-docker-compose up -d --remove-orphans ${DC_PARAMS[@]}
|
|
|
|
|
|
|
+docker-compose up -d --remove-orphans
|
|
|
|
|
|
|
|
echo -e "\e[32mCollecting garbage...\e[0m"
|
|
echo -e "\e[32mCollecting garbage...\e[0m"
|
|
|
IMGS_TO_DELETE=()
|
|
IMGS_TO_DELETE=()
|
andre.peters