Skip to content

Commit

Permalink
v8.14
Browse files Browse the repository at this point in the history
- 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: #6135
  • Loading branch information
MichaIng committed Feb 10, 2023
1 parent f05a2f0 commit f95bd3a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions dietpi/dietpi-software
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f95bd3a

Please sign in to comment.