From a763dda068a1b0f99e288ebd0c8a2b7697192ceb Mon Sep 17 00:00:00 2001 From: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com> Date: Mon, 12 Dec 2022 16:09:13 +0100 Subject: [PATCH 1/8] Update tweet-trigger-publish-release.yml --- .github/workflows/tweet-trigger-publish-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tweet-trigger-publish-release.yml b/.github/workflows/tweet-trigger-publish-release.yml index daebfe53..0f0d4516 100644 --- a/.github/workflows/tweet-trigger-publish-release.yml +++ b/.github/workflows/tweet-trigger-publish-release.yml @@ -17,4 +17,4 @@ jobs: consumer_secret: ${{ secrets.CONSUMER_SECRET }} access_token_key: ${{ secrets.ACCESS_TOKEN_KEY }} access_token_secret: ${{ secrets.ACCESS_TOKEN_SECRET }} - tweet_body: '$RELEASE_TAG is here! Checkout the GitHub Page for changelog regarding the $RELEASE_TAG Release: github.com/mailcow/mailcow-dockerized/releases/tag/$RELEASE_TAG' \ No newline at end of file + tweet_body: 'A new mailcow update has just been released! Checkout the GitHub Page for changelog and more informations: github.com/mailcow/mailcow-dockerized/releases/tag/latest' From 87214fef70fca6a05fd45302eb7f24bdcaf07ed3 Mon Sep 17 00:00:00 2001 From: Niklas Meyer <62480600+DerLinkman@users.noreply.github.com> Date: Tue, 13 Dec 2022 15:16:47 +0100 Subject: [PATCH 2/8] Update tweet-trigger-publish-release.yml --- .github/workflows/tweet-trigger-publish-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tweet-trigger-publish-release.yml b/.github/workflows/tweet-trigger-publish-release.yml index 0f0d4516..86cf628d 100644 --- a/.github/workflows/tweet-trigger-publish-release.yml +++ b/.github/workflows/tweet-trigger-publish-release.yml @@ -17,4 +17,4 @@ jobs: consumer_secret: ${{ secrets.CONSUMER_SECRET }} access_token_key: ${{ secrets.ACCESS_TOKEN_KEY }} access_token_secret: ${{ secrets.ACCESS_TOKEN_SECRET }} - tweet_body: 'A new mailcow update has just been released! Checkout the GitHub Page for changelog and more informations: github.com/mailcow/mailcow-dockerized/releases/tag/latest' + tweet_body: 'A new mailcow update has just been released! Checkout the GitHub Page for changelog and more informations: https://github.com/mailcow/mailcow-dockerized/releases/latest' From bfd53293633a386909aba5603f3a2227d30480e0 Mon Sep 17 00:00:00 2001 From: knuth Date: Fri, 16 Dec 2022 13:57:01 +0100 Subject: [PATCH 3/8] docker comes with compose --- .github/workflows/image_builds.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/image_builds.yml b/.github/workflows/image_builds.yml index fe660754..65678dff 100644 --- a/.github/workflows/image_builds.yml +++ b/.github/workflows/image_builds.yml @@ -33,13 +33,11 @@ jobs: run: | curl -sSL https://get.docker.com/ | CHANNEL=stable sudo sh sudo service docker start - sudo curl -L https://github.com/docker/compose/releases/download/v$(curl -Ls https://www.servercow.de/docker-compose/latest.php)/docker-compose-$(uname -s)-$(uname -m) > /usr/local/bin/docker-compose - sudo chmod +x /usr/local/bin/docker-compose - name: Prepair Image Builds run: | cp helper-scripts/docker-compose.override.yml.d/BUILD_FLAGS/docker-compose.override.yml docker-compose.override.yml - name: Build Docker Images run: | - docker-compose build ${image} + docker compose build ${image} env: image: ${{ matrix.images }} From a8d50955ee26ebe97d6b9d6229c635026bfbca47 Mon Sep 17 00:00:00 2001 From: knuth Date: Fri, 16 Dec 2022 13:57:13 +0100 Subject: [PATCH 4/8] Use built in compose --- data/web/_status.502.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/web/_status.502.html b/data/web/_status.502.html index efbc0e8b..35a66ba9 100644 --- a/data/web/_status.502.html +++ b/data/web/_status.502.html @@ -13,12 +13,12 @@ Please check the logs or contact support if the error persists.

Quick debugging

Check Nginx and PHP logs:

- 
docker-compose logs --tail=200 php-fpm-mailcow nginx-mailcow
+ 
docker compose logs --tail=200 php-fpm-mailcow nginx-mailcow

Make sure your SQL credentials in mailcow.conf (a link to .env) do fit your initialized SQL volume. If you see an access denied, you might have the wrong mailcow.conf:

- 
source mailcow.conf ; docker-compose exec mysql-mailcow mysql -u${DBUSER} -p${DBPASS} ${DBNAME}
+ 
source mailcow.conf ; docker compose exec mysql-mailcow mysql -u${DBUSER} -p${DBPASS} ${DBNAME}

In case of a previous failed installation, create a backup of your existing data, followed by removing all volumes and starting over (NEVER do this with a production system, it will remove ALL data):

BACKUP_LOCATION=/tmp/ ./helper-scripts/backup_and_restore.sh backup all
- 
docker-compose down --volumes ; docker-compose up -d
+ 
docker compose down --volumes ; docker compose up -d

Make sure your timezone is correct. Use "America/New_York" for example, do not use spaces. Check here for a list.


Click to learn more about getting support. From 7875185e1f30bcb93ed44aec8f4093df49950eb4 Mon Sep 17 00:00:00 2001 From: knuth Date: Fri, 16 Dec 2022 13:57:37 +0100 Subject: [PATCH 5/8] fix unicode char --- helper-scripts/update_compose.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helper-scripts/update_compose.sh b/helper-scripts/update_compose.sh index 16769edc..cae773c2 100755 --- a/helper-scripts/update_compose.sh +++ b/helper-scripts/update_compose.sh @@ -61,10 +61,10 @@ echo -e "\e[32mTrying to determine GLIBC version...\e[0m" elif [ "${DOCKER_COMPOSE_VERSION}" == "native" ]; then echo -e "\e[31mYou are using the native Docker Compose Plugin. This Script is for the standalone Docker Compose Version only.\e[0m" sleep 2 - echo -e "\e[33mNotice: You´ll have to update this Compose Version via your Package Manager manually!\e[0m" + echo -e "\e[33mNotice: You'll have to update this Compose Version via your Package Manager manually!\e[0m" exit 1 else echo -e "\e[31mCan not read DOCKER_COMPOSE_VERSION variable from mailcow.conf! Is your mailcow up to date? Exiting...\e[0m" exit 1 -fi \ No newline at end of file +fi From d98fd74968277843713d70b0f95ddd252e059d45 Mon Sep 17 00:00:00 2001 From: knuth Date: Fri, 16 Dec 2022 13:58:15 +0100 Subject: [PATCH 6/8] use GitHub for newest docker-compose release --- helper-scripts/update_compose.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/helper-scripts/update_compose.sh b/helper-scripts/update_compose.sh index cae773c2..b6640798 100755 --- a/helper-scripts/update_compose.sh +++ b/helper-scripts/update_compose.sh @@ -38,13 +38,16 @@ echo -e "\e[32mTrying to determine GLIBC version...\e[0m" 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) + elif [[ $(curl -sL -w "%{http_code}" https://github.com/docker/compose/releases/latest -o /dev/null) == "200" ]]; then + LATEST_COMPOSE=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/docker/compose/releases/latest) # redirect to latest release + LATEST_COMPOSE=${LATEST_COMPOSE##*/} #get the latest version from the redirect, inlcuding the "v" prefix + if [ $DC_DL_SUFFIX]; then + LATEST_COMPOSE=1.27.4 # force 1.27.4 for legacy systems, tag is not prefixed by "v" 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 + curl -#L https://github.com/docker/compose/releases/download/${LATEST_COMPOSE}/docker-compose-$(uname -s)-$(uname -m) > $COMPOSE_PATH chmod +x $COMPOSE_PATH echo -e "\e[32mYour Docker Compose (standalone) has been updated to: $LATEST_COMPOSE\e[0m" exit 0 From 65585e286d6e7b3ce65cc854a5ed291ddfcd35e8 Mon Sep 17 00:00:00 2001 From: knuth Date: Fri, 16 Dec 2022 14:16:46 +0100 Subject: [PATCH 7/8] use GitHub redirect for newest version --- helper-scripts/update_compose.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helper-scripts/update_compose.sh b/helper-scripts/update_compose.sh index b6640798..1dadbe33 100755 --- a/helper-scripts/update_compose.sh +++ b/helper-scripts/update_compose.sh @@ -4,7 +4,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source ${SCRIPT_DIR}/../mailcow.conf if [ "${DOCKER_COMPOSE_VERSION}" == "standalone" ]; then -LATEST_COMPOSE=$(curl -#L https://www.servercow.de/docker-compose/latest.php) +LATEST_COMPOSE=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/docker/compose/releases/latest) # redirect to latest release +LATEST_COMPOSE=${LATEST_COMPOSE##*/v} #get the latest version from the redirect, excluding the "v" prefix 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" From e5cf35aff89c7c9bce2a94fdff780c3b2cba708d Mon Sep 17 00:00:00 2001 From: knuth Date: Fri, 16 Dec 2022 14:17:17 +0100 Subject: [PATCH 8/8] fix unicode char --- helper-scripts/update_compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper-scripts/update_compose.sh b/helper-scripts/update_compose.sh index 1dadbe33..01be926f 100755 --- a/helper-scripts/update_compose.sh +++ b/helper-scripts/update_compose.sh @@ -34,7 +34,7 @@ echo -e "\e[32mTrying to determine GLIBC version...\e[0m" 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" + 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