From f95bd3a75d45f239dcf20e7f43102462cf9bdb2d Mon Sep 17 00:00:00 2001 From: MichaIng Date: Fri, 10 Feb 2023 23:53:21 +0100 Subject: [PATCH] v8.14 - DietPi-Software | Docker Compose: Migrated to the plugin variant, installed from the Docker APT repository. On existing installs, the migration can be done via "dietpi-software reinstall 134". To call it, use "docker compose" (without dash) from now on. Many thanks to @isarrider for making us aware of this: https://github.com/MichaIng/DietPi/issues/6135 --- CHANGELOG.txt | 1 + dietpi/dietpi-software | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4ed1fc7f52..99c3c928b2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,7 @@ Enhancements: - Most WiFi handling is now done with the modern "iw" utility instead of the legacy wireless-tools set. - DietPi-LetsEncrypt | HTTP/2 is now enabled automatically when applying HTTPS on Apache. Nginx and Lighttpd have this enabled OOTB already. - DietPi-Software | Gogs: Our ARMv6 build for Raspberry Pi 1 and Zero (1) models has been updated to latest version 0.12.10. The update can be applied via reinstall: dietpi-software reinstall 49 +- DietPi-Software | Docker Compose: Migrated to the plugin variant, installed from the Docker APT repository. On existing installs, the migration can be done via "dietpi-software reinstall 134". To call it, use "docker compose" (without dash) from now on. Many thanks to @isarrider for making us aware of this: https://github.com/MichaIng/DietPi/issues/6135 Bug fixes: - ROCK Pi S | Resolved an issue where the common serial console on UART0 did not show any output and login prompt. Many thanks to @Marsu31 for reporting this issue: https://github.com/MichaIng/DietPi/issues/5972 diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index 91669d3e2c..f0e331e9a5 100755 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -10402,11 +10402,9 @@ _EOF_ if To_Install 134 # Docker Compose then - command -v pip3 > /dev/null && G_EXEC_OUTPUT=1 G_EXEC pip3 uninstall -y docker-compose # Pre-v8.2 migration - local arch=${G_HW_ARCH_NAME%l} # armv[67]l => armv[67] - local fallback_url="https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-$arch" - Download_Install "$(curl -sSfL 'https://api.github.com/repos/docker/compose/releases/latest' | mawk -F\" "/\"browser_download_url\": \".*\/docker-compose-linux-$arch\"$/{print \$4}")" /usr/local/bin/docker-compose - G_EXEC chmod +x /usr/local/bin/docker-compose + command -v pip3 > /dev/null && G_EXEC_OUTPUT=1 G_EXEC pip3 uninstall -y docker-compose # Pre-v8.2 + [[ -f '/usr/local/bin/docker-compose' ]] && G_EXEC rm /usr/local/bin/docker-compose # Pre-v8.14 + G_AGI docker-compose-plugin fi if To_Install 161 # FuguHub @@ -13773,7 +13771,8 @@ _EOF_ if To_Uninstall 134 # Docker Compose then command -v pip3 > /dev/null && G_EXEC_OUTPUT=1 G_EXEC pip3 uninstall -y docker-compose # Pre-v8.2 - [[ -f '/usr/local/bin/docker-compose' ]] && G_EXEC rm /usr/local/bin/docker-compose + [[ -f '/usr/local/bin/docker-compose' ]] && G_EXEC rm /usr/local/bin/docker-compose # Pre-v8.14 + G_AGP docker-compose-plugin fi if To_Uninstall 162 # Docker