|  | @@ -175,58 +175,48 @@ remove_obsolete_nginx_ports() {
 | 
	
		
			
				|  |  |      done        
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -update_compose(){
 | 
	
		
			
				|  |  | -if [[ ${NO_UPDATE_COMPOSE} == "y" ]]; then
 | 
	
		
			
				|  |  | -  echo -e "\e[33mNot fetching latest docker-compose, please check for updates manually!\e[0m"
 | 
	
		
			
				|  |  | -  return 0
 | 
	
		
			
				|  |  | -elif [[ -e /etc/alpine-release ]]; then
 | 
	
		
			
				|  |  | -  echo -e "\e[33mNot fetching latest docker-compose, because you are using Alpine Linux without glibc support. Please update docker-compose via apk!\e[0m"
 | 
	
		
			
				|  |  | -  return 0
 | 
	
		
			
				|  |  | -else
 | 
	
		
			
				|  |  | -  if [ ! $FORCE ]; then
 | 
	
		
			
				|  |  | -    read -r -p "Do you want to update your docker-compose Version? It will automatic upgrade your docker-compose installation (recommended)? [y/N] " updatecomposeresponse 
 | 
	
		
			
				|  |  | -    if [[ ! "${updatecomposeresponse}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
 | 
	
		
			
				|  |  | -      echo "OK, not updating docker-compose."
 | 
	
		
			
				|  |  | -      return 0
 | 
	
		
			
				|  |  | -    fi
 | 
	
		
			
				|  |  | -  fi 
 | 
	
		
			
				|  |  | -  echo -e "\e[32mFetching new docker-compose version...\e[0m"
 | 
	
		
			
				|  |  | -  echo -e "\e[32mTrying to determine GLIBC version...\e[0m"
 | 
	
		
			
				|  |  | -  if ldd --version > /dev/null; then
 | 
	
		
			
				|  |  | -    GLIBC_V=$(ldd --version | grep -E '(GLIBC|GNU libc)' | rev | cut -d ' ' -f1 | rev | cut -d '.' -f2)
 | 
	
		
			
				|  |  | -    if [ ! -z "${GLIBC_V}" ] && [ ${GLIBC_V} -gt 27 ]; then
 | 
	
		
			
				|  |  | -      DC_DL_SUFFIX=
 | 
	
		
			
				|  |  | -    else
 | 
	
		
			
				|  |  | -      DC_DL_SUFFIX=legacy
 | 
	
		
			
				|  |  | -    fi
 | 
	
		
			
				|  |  | -  else
 | 
	
		
			
				|  |  | -    DC_DL_SUFFIX=legacy
 | 
	
		
			
				|  |  | -  fi
 | 
	
		
			
				|  |  | -  sleep 1
 | 
	
		
			
				|  |  | -  if [[ $(command -v pip 2>&1) && $(pip list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 || $(command -v pip3 2>&1) && $(pip3 list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 ]]; then
 | 
	
		
			
				|  |  | -    echo -e "\e[33mFound a docker-compose Version installed with pip!\e[0m"
 | 
	
		
			
				|  |  | -    echo -e "\e[31mPlease uninstall the pip Version of docker-compose since it doesn´t support Versions higher than 1.29.2.\e[0m"
 | 
	
		
			
				|  |  | -    sleep 2
 | 
	
		
			
				|  |  | -    echo -e "\e[33mExiting...\e[0m"
 | 
	
		
			
				|  |  | -    exit 1
 | 
	
		
			
				|  |  | -    #prevent breaking a working docker-compose installed with pip
 | 
	
		
			
				|  |  | -  elif [[ $(curl -sL -w "%{http_code}" https://www.servercow.de/docker-compose/latest.php?vers=${DC_DL_SUFFIX} -o /dev/null) == "200" ]]; then
 | 
	
		
			
				|  |  | -    LATEST_COMPOSE=$(curl -#L https://www.servercow.de/docker-compose/latest.php)
 | 
	
		
			
				|  |  | -    COMPOSE_VERSION=$(docker-compose version --short)
 | 
	
		
			
				|  |  | -    if [[ "$LATEST_COMPOSE" != "$COMPOSE_VERSION" ]]; then
 | 
	
		
			
				|  |  | -      COMPOSE_PATH=$(command -v docker-compose)
 | 
	
		
			
				|  |  | -      if [[ -w ${COMPOSE_PATH} ]]; then
 | 
	
		
			
				|  |  | -        curl -#L https://github.com/docker/compose/releases/download/v${LATEST_COMPOSE}/docker-compose-$(uname -s)-$(uname -m) > $COMPOSE_PATH
 | 
	
		
			
				|  |  | -        chmod +x $COMPOSE_PATH
 | 
	
		
			
				|  |  | +detect_docker_compose_command(){
 | 
	
		
			
				|  |  | +if ! [ "${DOCKER_COMPOSE_VERSION}" == "native" ] && ! [ "${DOCKER_COMPOSE_VERSION}" == "standalone" ]; then
 | 
	
		
			
				|  |  | +  if docker compose > /dev/null 2>&1; then
 | 
	
		
			
				|  |  | +      if docker compose version --short | grep "^2." > /dev/null 2>&1; then
 | 
	
		
			
				|  |  | +        DOCKER_COMPOSE_VERSION=native
 | 
	
		
			
				|  |  | +        COMPOSE_COMMAND="docker compose"
 | 
	
		
			
				|  |  | +        echo -e "\e[31mFound Docker Compose Plugin (native).\e[0m"
 | 
	
		
			
				|  |  | +        echo -e "\e[31mSetting the DOCKER_COMPOSE_VERSION Variable to native\e[0m"
 | 
	
		
			
				|  |  | +        sleep 2
 | 
	
		
			
				|  |  | +        echo -e "\e[33mNotice: You'll have to update this Compose Version via your Package Manager manually!\e[0m"
 | 
	
		
			
				|  |  |        else
 | 
	
		
			
				|  |  | -        echo -e "\e[33mWARNING: $COMPOSE_PATH is not writable, but new version $LATEST_COMPOSE is available (installed: $COMPOSE_VERSION)\e[0m"
 | 
	
		
			
				|  |  | -        return 1
 | 
	
		
			
				|  |  | +        echo -e "\e[31mCannot find Docker Compose with a Version Higher than 2.X.X.\e[0m" 
 | 
	
		
			
				|  |  | +        echo -e "\e[31mPlease update/install it manually regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"
 | 
	
		
			
				|  |  | +        exit 1
 | 
	
		
			
				|  |  | +      fi
 | 
	
		
			
				|  |  | +  elif docker-compose > /dev/null 2>&1; then
 | 
	
		
			
				|  |  | +    if ! [[ $(alias docker-compose 2> /dev/null) ]] ; then
 | 
	
		
			
				|  |  | +      if docker-compose version --short | grep "^2." > /dev/null 2>&1; then
 | 
	
		
			
				|  |  | +        DOCKER_COMPOSE_VERSION=standalone
 | 
	
		
			
				|  |  | +        COMPOSE_COMMAND="docker-compose"
 | 
	
		
			
				|  |  | +        echo -e "\e[31mFound Docker Compose Standalone.\e[0m"
 | 
	
		
			
				|  |  | +        echo -e "\e[31mSetting the DOCKER_COMPOSE_VERSION Variable to standalone\e[0m"
 | 
	
		
			
				|  |  | +        sleep 2
 | 
	
		
			
				|  |  | +        echo -e "\e[33mNotice: For an automatic update of docker-compose please use the update_compose.sh scripts located at the helper-scripts folder.[0m"
 | 
	
		
			
				|  |  | +      else
 | 
	
		
			
				|  |  | +        echo -e "\e[31mCannot find Docker Compose with a Version Higher than 2.X.X.\e[0m" 
 | 
	
		
			
				|  |  | +        echo -e "\e[31mPlease update/install regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"
 | 
	
		
			
				|  |  | +        exit 1
 | 
	
		
			
				|  |  |        fi
 | 
	
		
			
				|  |  |      fi
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |    else
 | 
	
		
			
				|  |  | -    echo -e "\e[33mCannot determine latest docker-compose version, skipping...\e[0m"
 | 
	
		
			
				|  |  | -    return 1
 | 
	
		
			
				|  |  | +    echo -e "\e[31mCannot find Docker Compose.\e[0m" 
 | 
	
		
			
				|  |  | +    echo -e "\e[31mPlease install it regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"
 | 
	
		
			
				|  |  | +    exit 1
 | 
	
		
			
				|  |  |    fi
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +elif [ "${DOCKER_COMPOSE_VERSION}" == "native" ]; then
 | 
	
		
			
				|  |  | +  COMPOSE_COMMAND="docker compose"
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +elif [ "${DOCKER_COMPOSE_VERSION}" == "standalone" ]; then
 | 
	
		
			
				|  |  | +  COMPOSE_COMMAND="docker-compose"
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -272,6 +262,10 @@ PATH=$PATH:/opt/bin
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  umask 0022
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +# Unset COMPOSE_COMMAND and DOCKER_COMPOSE_VERSION Variable to be on the newest state.
 | 
	
		
			
				|  |  | +unset COMPOSE_COMMAND
 | 
	
		
			
				|  |  | +unset DOCKER_COMPOSE_VERSION
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  for bin in curl docker git awk sha1sum; do
 | 
	
		
			
				|  |  |    if [[ -z $(command -v ${bin}) ]]; then 
 | 
	
		
			
				|  |  |    echo "Cannot find ${bin}, exiting..." 
 | 
	
	
		
			
				|  | @@ -279,13 +273,6 @@ for bin in curl docker git awk sha1sum; do
 | 
	
		
			
				|  |  |    fi  
 | 
	
		
			
				|  |  |  done
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -if [[ -z $(command -v docker-compose) ]]; then
 | 
	
		
			
				|  |  | -  echo -e "\e[31mCannot find docker-compose Standalone.\e[0m" 
 | 
	
		
			
				|  |  | -  echo -e "\e[31mPlease install it manually regarding to this doc site: https://mailcow.github.io/mailcow-dockerized-docs/i_u_m/i_u_m_install/\e[0m"
 | 
	
		
			
				|  |  | -  sleep 3
 | 
	
		
			
				|  |  | -  exit 1;
 | 
	
		
			
				|  |  | -fi
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  export LC_ALL=C
 | 
	
		
			
				|  |  |  DATE=$(date +%Y-%m-%d_%H_%M_%S)
 | 
	
		
			
				|  |  |  BRANCH=$(cd ${SCRIPT_DIR}; git rev-parse --abbrev-ref HEAD)
 | 
	
	
		
			
				|  | @@ -314,11 +301,22 @@ while (($#)); do
 | 
	
		
			
				|  |  |      --skip-start)
 | 
	
		
			
				|  |  |        SKIP_START=y
 | 
	
		
			
				|  |  |      ;;
 | 
	
		
			
				|  |  | +    --skip-ping-check)
 | 
	
		
			
				|  |  | +      SKIP_PING_CHECK=y
 | 
	
		
			
				|  |  | +    ;;
 | 
	
		
			
				|  |  | +    --stable)
 | 
	
		
			
				|  |  | +      CURRENT_BRANCH="$(cd ${SCRIPT_DIR}; git rev-parse --abbrev-ref HEAD)"
 | 
	
		
			
				|  |  | +      NEW_BRANCH="master"
 | 
	
		
			
				|  |  | +    ;;
 | 
	
		
			
				|  |  |      --gc)
 | 
	
		
			
				|  |  |        echo -e "\e[32mCollecting garbage...\e[0m"
 | 
	
		
			
				|  |  |        docker_garbage
 | 
	
		
			
				|  |  |        exit 0
 | 
	
		
			
				|  |  |      ;;
 | 
	
		
			
				|  |  | +    --nightly)
 | 
	
		
			
				|  |  | +      CURRENT_BRANCH="$(cd ${SCRIPT_DIR}; git rev-parse --abbrev-ref HEAD)"
 | 
	
		
			
				|  |  | +      NEW_BRANCH="nightly"
 | 
	
		
			
				|  |  | +    ;;
 | 
	
		
			
				|  |  |      --prefetch)
 | 
	
		
			
				|  |  |        echo -e "\e[32mPrefetching images...\e[0m"
 | 
	
		
			
				|  |  |        prefetch_images
 | 
	
	
		
			
				|  | @@ -328,36 +326,17 @@ while (($#)); do
 | 
	
		
			
				|  |  |        echo -e "\e[32mRunning in forced mode...\e[0m"
 | 
	
		
			
				|  |  |        FORCE=y
 | 
	
		
			
				|  |  |      ;;
 | 
	
		
			
				|  |  | -    --no-update-compose)
 | 
	
		
			
				|  |  | -      NO_UPDATE_COMPOSE=y
 | 
	
		
			
				|  |  | -    ;;
 | 
	
		
			
				|  |  | -    --update-compose)
 | 
	
		
			
				|  |  | -      LATEST_COMPOSE=$(curl -#L https://www.servercow.de/docker-compose/latest.php)
 | 
	
		
			
				|  |  | -      COMPOSE_VERSION=$(docker-compose version --short) 
 | 
	
		
			
				|  |  | -      if [[ "$LATEST_COMPOSE" != "$COMPOSE_VERSION" ]]; then
 | 
	
		
			
				|  |  | -        echo -e "\e[33mA new docker-compose Version is available: $LATEST_COMPOSE\e[0m"
 | 
	
		
			
				|  |  | -        echo -e "\e[33mYour Version is: $COMPOSE_VERSION\e[0m"
 | 
	
		
			
				|  |  | -        update_compose
 | 
	
		
			
				|  |  | -        echo -e "\e[32mYour docker-compose Version is now up to date!\e[0m" 
 | 
	
		
			
				|  |  | -      else
 | 
	
		
			
				|  |  | -      echo -e "\e[32mYour docker-compose Version is up to date! Not updating it...\e[0m" 
 | 
	
		
			
				|  |  | -      fi
 | 
	
		
			
				|  |  | -      exit 0
 | 
	
		
			
				|  |  | -    ;;
 | 
	
		
			
				|  |  | -    --skip-ping-check)
 | 
	
		
			
				|  |  | -      SKIP_PING_CHECK=y
 | 
	
		
			
				|  |  | -    ;;
 | 
	
		
			
				|  |  |      --help|-h)
 | 
	
		
			
				|  |  | -    echo './update.sh [-c|--check, --ours, --gc, --no-update-compose, --update-compose, --prefetch, --skip-start, --skip-ping-check, -f|--force, -h|--help]
 | 
	
		
			
				|  |  | +    echo './update.sh [-c|--check, --ours, --gc, --nightly, --prefetch, --skip-start, --skip-ping-check, --stable, -f|--force, -h|--help]
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    -c|--check           -   Check for updates and exit (exit codes => 0: update available, 3: no updates)
 | 
	
		
			
				|  |  |    --ours               -   Use merge strategy option "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
 | 
	
		
			
				|  |  |    --gc                 -   Run garbage collector to delete old image tags
 | 
	
		
			
				|  |  | -  --no-update-compose  -   Skip the docker-compose Updates during the mailcow Update process
 | 
	
		
			
				|  |  | -  --update-compose     -   Only run the docker-compose Update process (don´t updates your mailcow itself)
 | 
	
		
			
				|  |  | +  --nightly            -   Switch your mailcow updates to the unstable (nightly) branch. FOR TESTING PURPOSES ONLY!!!!
 | 
	
		
			
				|  |  |    --prefetch           -   Only prefetch new images and exit (useful to prepare updates)
 | 
	
		
			
				|  |  |    --skip-start         -   Do not start mailcow after update
 | 
	
		
			
				|  |  |    --skip-ping-check    -   Skip ICMP Check to public DNS resolvers (Use it only if you´ve blocked any ICMP Connections to your mailcow machine)
 | 
	
		
			
				|  |  | +  --stable             -   Switch your mailcow updates to the stable (master) branch. Default unless you changed it with --nightly.
 | 
	
		
			
				|  |  |    -f|--force           -   Force update, do not ask questions
 | 
	
		
			
				|  |  |  '
 | 
	
		
			
				|  |  |      exit 1
 | 
	
	
		
			
				|  | @@ -365,28 +344,16 @@ while (($#)); do
 | 
	
		
			
				|  |  |    shift
 | 
	
		
			
				|  |  |  done
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -# Check if Docker-Compose is older then v2 before continuing
 | 
	
		
			
				|  |  | -if ! docker-compose version --short | grep "^2." > /dev/null 2>&1; then
 | 
	
		
			
				|  |  | -  echo -e "\e[33mYour docker-compose Version is not up to date!\e[0m"
 | 
	
		
			
				|  |  | -  echo -e "\e[33mmailcow needs docker-compose > 2.X.X!\e[0m"
 | 
	
		
			
				|  |  | -  echo -e "\e[33mYour current installed Version: $(docker-compose version --short)\e[0m"
 | 
	
		
			
				|  |  | -  sleep 3
 | 
	
		
			
				|  |  | -  update_compose
 | 
	
		
			
				|  |  | -  if [[ ! "${updatecomposeresponse}" =~ ^([yY][eE][sS]|[yY])+$ ]] && [[ ! ${FORCE} ]]; then
 | 
	
		
			
				|  |  | -     echo -e "\e[31mmailcow does not work with docker-compose < 2.X.X anymore!\e[0m"
 | 
	
		
			
				|  |  | -     echo -e "\e[31mPlease update your docker-compose manually, to run mailcow.\e[0m"
 | 
	
		
			
				|  |  | -     echo -e "\e[31mExiting...\e[0m"
 | 
	
		
			
				|  |  | -     exit 1
 | 
	
		
			
				|  |  | -  fi
 | 
	
		
			
				|  |  | -fi
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -[[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing"; exit 1;}
 | 
	
		
			
				|  |  |  chmod 600 mailcow.conf
 | 
	
		
			
				|  |  |  source mailcow.conf
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +detect_docker_compose_command
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +[[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing! Is mailcow installed?"; exit 1;}
 | 
	
		
			
				|  |  |  DOTS=${MAILCOW_HOSTNAME//[^.]};
 | 
	
		
			
				|  |  |  if [ ${#DOTS} -lt 2 ]; then
 | 
	
		
			
				|  |  |    echo "MAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is not a FQDN!"
 | 
	
		
			
				|  |  | -  echo "Please change it to a FQDN and run docker-compose down followed by docker-compose up -d"
 | 
	
		
			
				|  |  | +  echo "Please change it to a FQDN and run $COMPOSE_COMMAND down followed by $COMPOSE_COMMAND up -d"
 | 
	
		
			
				|  |  |    exit 1
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -395,6 +362,14 @@ if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusyBox grep
 | 
	
		
			
				|  |  |  if cp --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusyBox cp detected, please install coreutils, \"apk add --no-cache --upgrade coreutils\""; exit 1; fi
 | 
	
		
			
				|  |  |  if sed --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusyBox sed detected, please install gnu sed, \"apk add --no-cache --upgrade sed\""; exit 1; fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +# Check if Docker Compose is older then v2 before continuing
 | 
	
		
			
				|  |  | +if ! $COMPOSE_COMMAND version --short | grep "^2." > /dev/null 2>&1; then
 | 
	
		
			
				|  |  | +  echo -e "\e[33mYour Docker Compose Version is not up to date!\e[0m"
 | 
	
		
			
				|  |  | +  echo -e "\e[33mmailcow needs Docker Compose > 2.X.X!\e[0m"
 | 
	
		
			
				|  |  | +  echo -e "\e[33mYour current installed Version: $($COMPOSE_COMMAND version --short)\e[0m"
 | 
	
		
			
				|  |  | +  exit 1
 | 
	
		
			
				|  |  | +fi
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  CONFIG_ARRAY=(
 | 
	
		
			
				|  |  |    "SKIP_LETS_ENCRYPT"
 | 
	
		
			
				|  |  |    "SKIP_SOGO"
 | 
	
	
		
			
				|  | @@ -413,6 +388,7 @@ CONFIG_ARRAY=(
 | 
	
		
			
				|  |  |    "SNAT_TO_SOURCE"
 | 
	
		
			
				|  |  |    "SNAT6_TO_SOURCE"
 | 
	
		
			
				|  |  |    "COMPOSE_PROJECT_NAME"
 | 
	
		
			
				|  |  | +  "DOCKER_COMPOSE_VERSION"
 | 
	
		
			
				|  |  |    "SQL_PORT"
 | 
	
		
			
				|  |  |    "API_KEY"
 | 
	
		
			
				|  |  |    "API_KEY_READ_ONLY"
 | 
	
	
		
			
				|  | @@ -448,6 +424,17 @@ for option in ${CONFIG_ARRAY[@]}; do
 | 
	
		
			
				|  |  |        echo "Adding new option \"${option}\" to mailcow.conf"
 | 
	
		
			
				|  |  |        echo "COMPOSE_PROJECT_NAME=mailcowdockerized" >> mailcow.conf
 | 
	
		
			
				|  |  |      fi
 | 
	
		
			
				|  |  | +  elif [[ ${option} == "DOCKER_COMPOSE_VERSION" ]]; then
 | 
	
		
			
				|  |  | +    if ! grep -q ${option} mailcow.conf; then
 | 
	
		
			
				|  |  | +      echo "Adding new option \"${option}\" to mailcow.conf"
 | 
	
		
			
				|  |  | +      echo "# Used Docker Compose version" >> mailcow.conf
 | 
	
		
			
				|  |  | +      echo "# Switch here between native (compose plugin) and standalone" >> mailcow.conf
 | 
	
		
			
				|  |  | +      echo "# For more informations take a look at the mailcow docs regarding the configuration options." >> mailcow.conf
 | 
	
		
			
				|  |  | +      echo "# Normally this should be untouched but if you decided to use either of those you can switch it manually here." >> mailcow.conf
 | 
	
		
			
				|  |  | +      echo "# Please be aware that at least one of those variants should be installed on your maschine or mailcow will fail." >> mailcow.conf
 | 
	
		
			
				|  |  | +      echo "" >> mailcow.conf
 | 
	
		
			
				|  |  | +      echo "DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION}" >> mailcow.conf
 | 
	
		
			
				|  |  | +    fi
 | 
	
		
			
				|  |  |    elif [[ ${option} == "DOVEADM_PORT" ]]; then
 | 
	
		
			
				|  |  |      if ! grep -q ${option} mailcow.conf; then
 | 
	
		
			
				|  |  |        echo "Adding new option \"${option}\" to mailcow.conf"
 | 
	
	
		
			
				|  | @@ -672,6 +659,82 @@ else
 | 
	
		
			
				|  |  |     fi
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +if ! [ $NEW_BRANCH ]; then
 | 
	
		
			
				|  |  | +  echo -e "\e[33mDetecting which build your mailcow runs on...\e[0m"
 | 
	
		
			
				|  |  | +  sleep 1
 | 
	
		
			
				|  |  | +  if [ ${BRANCH} == "master" ]; then
 | 
	
		
			
				|  |  | +    echo -e "\e[32mYou are receiving stable updates (master).\e[0m"
 | 
	
		
			
				|  |  | +    echo -e "\e[33mTo change that run the update.sh Script one time with the --nightly parameter to switch to nightly builds.\e[0m"
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  elif [ ${BRANCH} == "nightly" ]; then
 | 
	
		
			
				|  |  | +    echo -e "\e[31mYou are receiving unstable updates (nightly). These are for testing purposes only!!!\e[0m"
 | 
	
		
			
				|  |  | +    sleep 1
 | 
	
		
			
				|  |  | +    echo -e "\e[33mTo change that run the update.sh Script one time with the --stable parameter to switch to stable builds.\e[0m"
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +  else
 | 
	
		
			
				|  |  | +    echo -e "\e[33mYou are receiving updates from a unsupported branch.\e[0m"
 | 
	
		
			
				|  |  | +    sleep 1
 | 
	
		
			
				|  |  | +    echo -e "\e[33mThe mailcow stack might still work but it is recommended to switch to the master branch (stable builds).\e[0m"
 | 
	
		
			
				|  |  | +    echo -e "\e[33mTo change that run the update.sh Script one time with the --stable parameter to switch to stable builds.\e[0m"
 | 
	
		
			
				|  |  | +  fi
 | 
	
		
			
				|  |  | +elif [ $FORCE ]; then
 | 
	
		
			
				|  |  | +  echo -e "\e[31mYou are running in forced mode!\e[0m"
 | 
	
		
			
				|  |  | +  echo -e "\e[31mA Branch Switch can only be performed manually (monitored).\e[0m"
 | 
	
		
			
				|  |  | +  echo -e "\e[31mPlease rerun the update.sh Script without the --force/-f parameter.\e[0m"
 | 
	
		
			
				|  |  | +  sleep 1
 | 
	
		
			
				|  |  | +elif [ $NEW_BRANCH == "master" ] && [ $CURRENT_BRANCH != "master" ]; then
 | 
	
		
			
				|  |  | +  echo -e "\e[33mYou are about to switch your mailcow Updates to the stable (master) branch.\e[0m"
 | 
	
		
			
				|  |  | +  sleep 1
 | 
	
		
			
				|  |  | +  echo -e "\e[33mBefore you do: Please take a backup of all components to ensure that no Data is lost...\e[0m"
 | 
	
		
			
				|  |  | +  sleep 1
 | 
	
		
			
				|  |  | +  echo -e "\e[31mWARNING: Please see on GitHub or ask in the communitys if a switch to master is stable or not.
 | 
	
		
			
				|  |  | +  In some rear cases a Update back to master can destroy your mailcow configuration in case of Database Upgrades etc.
 | 
	
		
			
				|  |  | +  Normally a upgrade back to master should be safe during each full release. 
 | 
	
		
			
				|  |  | +  Check GitHub for Database Changes and Update only if there similar to the full release!\e[0m"
 | 
	
		
			
				|  |  | +  read -r -p "Are you sure you that want to continue upgrading to the stable (master) branch? [y/N] " response
 | 
	
		
			
				|  |  | +  if [[ ! "${response}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
 | 
	
		
			
				|  |  | +    echo "OK. If you prepared yourself for that please run the update.sh Script with the --stable parameter again to trigger this process here."
 | 
	
		
			
				|  |  | +    exit 0
 | 
	
		
			
				|  |  | +  fi
 | 
	
		
			
				|  |  | +  BRANCH=$NEW_BRANCH
 | 
	
		
			
				|  |  | +  DIFF_DIRECTORY=update_diffs
 | 
	
		
			
				|  |  | +  DIFF_FILE=${DIFF_DIRECTORY}/diff_before_upgrade_to_master_$(date +"%Y-%m-%d-%H-%M-%S")
 | 
	
		
			
				|  |  | +  mv diff_before_upgrade* ${DIFF_DIRECTORY}/ 2> /dev/null
 | 
	
		
			
				|  |  | +  if ! git diff-index --quiet HEAD; then
 | 
	
		
			
				|  |  | +    echo -e "\e[32mSaving diff to ${DIFF_FILE}...\e[0m"
 | 
	
		
			
				|  |  | +    mkdir -p ${DIFF_DIRECTORY}
 | 
	
		
			
				|  |  | +    git diff ${BRANCH} --stat > ${DIFF_FILE}
 | 
	
		
			
				|  |  | +    git diff ${BRANCH} >> ${DIFF_FILE}
 | 
	
		
			
				|  |  | +  fi
 | 
	
		
			
				|  |  | +  echo -e "\e[32mSwitching Branch to ${BRANCH}...\e[0m"
 | 
	
		
			
				|  |  | +  git fetch origin
 | 
	
		
			
				|  |  | +  git checkout -f ${BRANCH}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +elif [ $NEW_BRANCH == "nightly" ] && [ $CURRENT_BRANCH != "nightly" ]; then
 | 
	
		
			
				|  |  | +  echo -e "\e[33mYou are about to switch your mailcow Updates to the unstable (nightly) branch.\e[0m"
 | 
	
		
			
				|  |  | +  sleep 1
 | 
	
		
			
				|  |  | +  echo -e "\e[33mBefore you do: Please take a backup of all components to ensure that no Data is lost...\e[0m"
 | 
	
		
			
				|  |  | +  sleep 1
 | 
	
		
			
				|  |  | +  echo -e "\e[31mWARNING: A switch to nightly is possible any time. But a switch back (to master) isn't.\e[0m"
 | 
	
		
			
				|  |  | +  read -r -p "Are you sure you that want to continue upgrading to the unstable (nightly) branch? [y/N] " response
 | 
	
		
			
				|  |  | +  if [[ ! "${response}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
 | 
	
		
			
				|  |  | +    echo "OK. If you prepared yourself for that please run the update.sh Script with the --nightly parameter again to trigger this process here."
 | 
	
		
			
				|  |  | +    exit 0
 | 
	
		
			
				|  |  | +  fi
 | 
	
		
			
				|  |  | +  BRANCH=$NEW_BRANCH
 | 
	
		
			
				|  |  | +  DIFF_DIRECTORY=update_diffs
 | 
	
		
			
				|  |  | +  DIFF_FILE=${DIFF_DIRECTORY}/diff_before_upgrade_to_nightly_$(date +"%Y-%m-%d-%H-%M-%S")
 | 
	
		
			
				|  |  | +  mv diff_before_upgrade* ${DIFF_DIRECTORY}/ 2> /dev/null
 | 
	
		
			
				|  |  | +  if ! git diff-index --quiet HEAD; then
 | 
	
		
			
				|  |  | +    echo -e "\e[32mSaving diff to ${DIFF_FILE}...\e[0m"
 | 
	
		
			
				|  |  | +    mkdir -p ${DIFF_DIRECTORY}
 | 
	
		
			
				|  |  | +    git diff ${BRANCH} --stat > ${DIFF_FILE}
 | 
	
		
			
				|  |  | +    git diff ${BRANCH} >> ${DIFF_FILE}
 | 
	
		
			
				|  |  | +  fi
 | 
	
		
			
				|  |  | +  git fetch origin
 | 
	
		
			
				|  |  | +  git checkout -f ${BRANCH}
 | 
	
		
			
				|  |  | +fi
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  echo -e "\e[32mChecking for newer update script...\e[0m"
 | 
	
		
			
				|  |  |  SHA1_1=$(sha1sum update.sh)
 | 
	
		
			
				|  |  |  git fetch origin #${BRANCH}
 | 
	
	
		
			
				|  | @@ -683,13 +746,6 @@ if [[ ${SHA1_1} != ${SHA1_2} ]]; then
 | 
	
		
			
				|  |  |    exit 2
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -if [[ -f mailcow.conf ]]; then
 | 
	
		
			
				|  |  | -  source mailcow.conf
 | 
	
		
			
				|  |  | -else
 | 
	
		
			
				|  |  | -  echo -e "\e[31mNo mailcow.conf - is mailcow installed?\e[0m"
 | 
	
		
			
				|  |  | -  exit 1
 | 
	
		
			
				|  |  | -fi
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  if [ ! $FORCE ]; then
 | 
	
		
			
				|  |  |    read -r -p "Are you sure you want to update mailcow: dockerized? All containers will be stopped. [y/N] " response
 | 
	
		
			
				|  |  |    if [[ ! "${response}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
 | 
	
	
		
			
				|  | @@ -699,28 +755,18 @@ if [ ! $FORCE ]; then
 | 
	
		
			
				|  |  |    migrate_docker_nat
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -LATEST_COMPOSE=$(curl -#L https://www.servercow.de/docker-compose/latest.php)
 | 
	
		
			
				|  |  | -COMPOSE_VERSION=$(docker-compose version --short)
 | 
	
		
			
				|  |  | -if [[ "$LATEST_COMPOSE" != "$COMPOSE_VERSION" ]]; then
 | 
	
		
			
				|  |  | -  echo -e "\e[33mA new docker-compose Version is available: $LATEST_COMPOSE\e[0m"
 | 
	
		
			
				|  |  | -  echo -e "\e[33mYour Version is: $COMPOSE_VERSION\e[0m"
 | 
	
		
			
				|  |  | -  update_compose
 | 
	
		
			
				|  |  | -else
 | 
	
		
			
				|  |  | -  echo -e "\e[32mYour docker-compose Version is up to date! Not updating it...\e[0m" 
 | 
	
		
			
				|  |  | -fi
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  remove_obsolete_nginx_ports
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  echo -e "\e[32mValidating docker-compose stack configuration...\e[0m"
 | 
	
		
			
				|  |  |  sed -i 's/HTTPS_BIND:-:/HTTPS_BIND:-/g' docker-compose.yml
 | 
	
		
			
				|  |  |  sed -i 's/HTTP_BIND:-:/HTTP_BIND:-/g' docker-compose.yml
 | 
	
		
			
				|  |  | -if ! docker-compose config -q; then
 | 
	
		
			
				|  |  | +if ! $COMPOSE_COMMAND config -q; then
 | 
	
		
			
				|  |  |    echo -e "\e[31m\nOh no, something went wrong. Please check the error message above.\e[0m"
 | 
	
		
			
				|  |  |    exit 1
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  echo -e "\e[32mChecking for conflicting bridges...\e[0m"
 | 
	
		
			
				|  |  | -MAILCOW_BRIDGE=$(docker-compose config | grep -i com.docker.network.bridge.name | cut -d':' -f2)
 | 
	
		
			
				|  |  | +MAILCOW_BRIDGE=$($COMPOSE_COMMAND config | grep -i com.docker.network.bridge.name | cut -d':' -f2)
 | 
	
		
			
				|  |  |  while read NAT_ID; do
 | 
	
		
			
				|  |  |    iptables -t nat -D POSTROUTING $NAT_ID
 | 
	
		
			
				|  |  |  done < <(iptables -L -vn -t nat --line-numbers | grep $IPV4_NETWORK | grep -E 'MASQUERADE.*all' | grep -v ${MAILCOW_BRIDGE} | cut -d' ' -f1)
 | 
	
	
		
			
				|  | @@ -740,8 +786,8 @@ prefetch_images
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  echo -e "\e[32mStopping mailcow...\e[0m"
 | 
	
		
			
				|  |  |  sleep 2
 | 
	
		
			
				|  |  | -MAILCOW_CONTAINERS=($(docker-compose ps -q))
 | 
	
		
			
				|  |  | -docker-compose down
 | 
	
		
			
				|  |  | +MAILCOW_CONTAINERS=($($COMPOSE_COMMAND ps -q))
 | 
	
		
			
				|  |  | +$COMPOSE_COMMAND down
 | 
	
		
			
				|  |  |  echo -e "\e[32mChecking for remaining containers...\e[0m"
 | 
	
		
			
				|  |  |  sleep 2
 | 
	
		
			
				|  |  |  for container in "${MAILCOW_CONTAINERS[@]}"; do
 | 
	
	
		
			
				|  | @@ -778,13 +824,13 @@ elif [[ ${MERGE_RETURN} == 1 ]]; then
 | 
	
		
			
				|  |  |  elif [[ ${MERGE_RETURN} != 0 ]]; then
 | 
	
		
			
				|  |  |    echo -e "\e[31m\nOh no, something went wrong. Please check the error message above.\e[0m"
 | 
	
		
			
				|  |  |    echo
 | 
	
		
			
				|  |  | -  echo "Run docker-compose up -d to restart your stack without updates or try again after fixing the mentioned errors."
 | 
	
		
			
				|  |  | +  echo "Run $COMPOSE_COMMAND up -d to restart your stack without updates or try again after fixing the mentioned errors."
 | 
	
		
			
				|  |  |    exit 1
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  echo -e "\e[32mFetching new images, if any...\e[0m"
 | 
	
		
			
				|  |  |  sleep 2
 | 
	
		
			
				|  |  | -docker-compose pull
 | 
	
		
			
				|  |  | +$COMPOSE_COMMAND pull
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # Fix missing SSL, does not overwrite existing files
 | 
	
		
			
				|  |  |  [[ ! -d data/assets/ssl ]] && mkdir -p data/assets/ssl
 | 
	
	
		
			
				|  | @@ -796,7 +842,7 @@ if grep -q 'SYSCTL_IPV6_DISABLED=1' mailcow.conf; then
 | 
	
		
			
				|  |  |    echo '!! IMPORTANT !!'
 | 
	
		
			
				|  |  |    echo
 | 
	
		
			
				|  |  |    echo 'SYSCTL_IPV6_DISABLED was removed due to complications. IPv6 can be disabled by editing "docker-compose.yml" and setting "enable_ipv6: true" to "enable_ipv6: false".'
 | 
	
		
			
				|  |  | -  echo 'This setting will only be active after a complete shutdown of mailcow by running "docker-compose down" followed by "docker-compose up -d".'
 | 
	
		
			
				|  |  | +  echo 'This setting will only be active after a complete shutdown of mailcow by running $COMPOSE_COMMAND down followed by $COMPOSE_COMMAND up -d".'
 | 
	
		
			
				|  |  |    echo
 | 
	
		
			
				|  |  |    echo '!! IMPORTANT !!'
 | 
	
		
			
				|  |  |    echo
 | 
	
	
		
			
				|  | @@ -824,26 +870,55 @@ if [ -f "data/conf/rspamd/local.d/metrics.conf" ]; then
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  # Set app_info.inc.php
 | 
	
		
			
				|  |  | -mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
 | 
	
		
			
				|  |  | +if [ ${BRANCH} == "master" ]; then
 | 
	
		
			
				|  |  | +  mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
 | 
	
		
			
				|  |  | +elif [ ${BRANCH} == "nightly" ]; then
 | 
	
		
			
				|  |  | +  mailcow_git_version=$(git rev-parse --short $(git rev-parse @{upstream}))
 | 
	
		
			
				|  |  | +  mailcow_last_git_version=""
 | 
	
		
			
				|  |  | +else
 | 
	
		
			
				|  |  | +  mailcow_git_version=$(git rev-parse --short HEAD)
 | 
	
		
			
				|  |  | +  mailcow_last_git_version=""
 | 
	
		
			
				|  |  | +fi
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +mailcow_git_commit=$(git rev-parse origin/${BRANCH})
 | 
	
		
			
				|  |  | +mailcow_git_commit_date=$(git log -1 --format=%ci @{upstream} )
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  if [ $? -eq 0 ]; then
 | 
	
		
			
				|  |  |    echo '<?php' > data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  |    echo '  $MAILCOW_GIT_VERSION="'$mailcow_git_version'";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_LAST_GIT_VERSION="";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_OWNER="mailcow";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_REPO="mailcow-dockerized";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  |    echo '  $MAILCOW_GIT_URL="https://github.com/mailcow/mailcow-dockerized";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_COMMIT="'$mailcow_git_commit'";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_COMMIT_DATE="'$mailcow_git_commit_date'";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_BRANCH="'$BRANCH'";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_UPDATEDAT='$(date +%s)';' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  |    echo '?>' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  |  else
 | 
	
		
			
				|  |  |    echo '<?php' > data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | -  echo '  $MAILCOW_GIT_VERSION="";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | -  echo '  $MAILCOW_GIT_URL="";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_VERSION="'$mailcow_git_version'";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_LAST_GIT_VERSION="";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_OWNER="mailcow";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_REPO="mailcow-dockerized";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_URL="https://github.com/mailcow/mailcow-dockerized";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_COMMIT="";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_GIT_COMMIT_DATE="";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_BRANCH="'$BRANCH'";' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  | +  echo '  $MAILCOW_UPDATEDAT='$(date +%s)';' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  |    echo '?>' >> data/web/inc/app_info.inc.php
 | 
	
		
			
				|  |  |    echo -e "\e[33mCannot determine current git repository version...\e[0m"
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +# Set DOCKER_COMPOSE_VERSION
 | 
	
		
			
				|  |  | +sed -i 's/^DOCKER_COMPOSE_VERSION=$/DOCKER_COMPOSE_VERSION='$DOCKER_COMPOSE_VERSION'/g' mailcow.conf
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  if [[ ${SKIP_START} == "y" ]]; then
 | 
	
		
			
				|  |  | -  echo -e "\e[33mNot starting mailcow, please run \"docker-compose up -d --remove-orphans\" to start mailcow.\e[0m"
 | 
	
		
			
				|  |  | +  echo -e "\e[33mNot starting mailcow, please run \"$COMPOSE_COMMAND up -d --remove-orphans\" to start mailcow.\e[0m"
 | 
	
		
			
				|  |  |  else
 | 
	
		
			
				|  |  |    echo -e "\e[32mStarting mailcow...\e[0m"
 | 
	
		
			
				|  |  |    sleep 2
 | 
	
		
			
				|  |  | -  docker-compose up -d --remove-orphans
 | 
	
		
			
				|  |  | +  $COMPOSE_COMMAND up -d --remove-orphans
 | 
	
		
			
				|  |  |  fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  echo -e "\e[32mCollecting garbage...\e[0m"
 | 
	
	
		
			
				|  | @@ -858,4 +933,4 @@ fi
 | 
	
		
			
				|  |  |  # echo
 | 
	
		
			
				|  |  |  # git reflog --color=always | grep "Before update on "
 | 
	
		
			
				|  |  |  # echo
 | 
	
		
			
				|  |  | -# echo "Use \"git reset --hard hash-on-the-left\" and run docker-compose up -d afterwards."
 | 
	
		
			
				|  |  | +# echo "Use \"git reset --hard hash-on-the-left\" and run $COMPOSE_COMMAND up -d afterwards."
 |