v6.25

+ DietPi-Software | Add workaround for missing Docker Raspbian Buster branch
MichaIng · Jul 1, 2019 · 093ca14 · 093ca14
1 parent 6e55b62
commit 093ca14
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -6043,19 +6043,27 @@ If you want to update ${aSOFTWARE_WHIP_NAME[$software_id]}, please use it's inte
 			Banner_Installing
 
 			INSTALL_URL_ADDRESS='https://get.docker.com'
+			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 
 			# Current workaround for faulty docker-ce repo version on RPi: https://github.com/MichaIng/DietPi/issues/2282
-			(( $G_HW_MODEL < 10 )) && echo 'Package: docker-ce
+			(( $G_HW_MODEL < 10 )) && echo 'Package: docker-ce docker-ce-cli
 Pin: version 5:18.09.0~3-0~raspbian-stretch
 Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 
-			G_CHECK_URL "$INSTALL_URL_ADDRESS"
-
-			# Offical Docker recommended install command
+			# Offical Docker installer
 			wget "$INSTALL_URL_ADDRESS" -O DockerInstall.sh
 			chmod +x DockerInstall.sh
 			./DockerInstall.sh
-			#rm DockerInstall.sh
+			rm DockerInstall.sh
+			# - Raspbian Buster branch is missing, so revert to Stretch: https://download.docker.com/linux/raspbian/dists/
+			if (( $G_DISTRO > 4 && $G_HW_MODEL < 10 )) && ! G_ERROR_HANDLER_INFO_ONLY=1 G_USER_INPUTS=0 G_CHECK_URL 'https://download.docker.com/linux/raspbian/dists/buster/'; then
+
+				G_DIETPI-NOTIFY 2 'Docker repo misses a Raspbian Buster branch, reverting to Stretch...'
+				sed -i 's/[[:blank:]]buster[[:blank:]]/ stretch /' /etc/apt/sources.list.d/docker.list
+				G_AGUP
+				G_AGI docker-ce docker-ce-cli
+
+			fi
 
 		fi