Remove software-properties-common dependency. Check if candidate for installation is available.

Author: 0xfornax

shared/services/rocketpool/assets/scripts/install.sh

@@ -132,14 +132,17 @@ case "$PLATFORM" in
         # Install OS dependencies
         progress 1 "Installing OS dependencies..."
         { $SUDO_CMD apt-get -y update || fail "Could not update OS package definitions."; } >&2
-        { $SUDO_CMD apt-get -y install apt-transport-https ca-certificates curl gnupg gnupg-agent lsb-release software-properties-common chrony || fail "Could not install OS packages."; } >&2
+        { $SUDO_CMD apt-get -y install apt-transport-https ca-certificates curl gnupg gnupg-agent lsb-release chrony || fail "Could not install OS packages."; } >&2
 
         # Check for existing Docker installation
         progress 2 "Checking if Docker is installed..."
         dpkg-query -W -f='${Status}' docker-ce 2>&1 | grep -q -P '^install ok installed$' > /dev/null
         if [ $? != "0" ]; then
             echo "Installing Docker..."
-            if [ ! -f /etc/apt/sources.list.d/docker.list ]; then
+            # Check for an available installation candidate
+            REPO_FOUND=$(apt-cache policy docker-ce 2>/dev/null | awk '/Candidate:/ {print $2}')
+            if [ -z "$REPO_FOUND" -o "$REPO_FOUND" = "(none)" ]; then
+                echo "No installation candidate found for docker-ce. Setting up Docker repository..."
                 # Install the Docker repo
                 { $SUDO_CMD mkdir -p /etc/apt/keyrings || fail "Could not create APT keyrings directory."; } >&2
                 { curl -fsSL "https://download.docker.com/linux/$PLATFORM_NAME/gpg" | $SUDO_CMD gpg --dearmor -o /etc/apt/keyrings/docker.gpg || fail "Could not add docker repository key."; } >&2
@@ -154,9 +157,11 @@ case "$PLATFORM" in
         dpkg-query -W -f='${Status}' docker-compose-plugin 2>&1 | grep -q -P '^install ok installed$' > /dev/null
         if [ $? != "0" ]; then
             echo "Installing docker-compose-plugin..."
-            if [ ! -f /etc/apt/sources.list.d/docker.list ]; then
-                # Install the Docker repo, removing the legacy one if it exists
-                { $SUDO_CMD add-apt-repository --remove "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/$PLATFORM_NAME $(lsb_release -cs) stable"; } 2>/dev/null
+            # Check for an available installation candidate
+            REPO_FOUND=$(apt-cache policy docker-compose-plugin 2>/dev/null | awk '/Candidate:/ {print $2}')
+            if [ -z "$REPO_FOUND" -o "$REPO_FOUND" = "(none)" ]; then
+                echo "No installation candidate found for docker-compose-plugin. Setting up Docker repository..."
+                # Install the Docker repo
                 { $SUDO_CMD mkdir -p /etc/apt/keyrings || fail "Could not create APT keyrings directory."; } >&2
                 { curl -fsSL "https://download.docker.com/linux/$PLATFORM_NAME/gpg" | $SUDO_CMD gpg --dearmor -o /etc/apt/keyrings/docker.gpg || fail "Could not add docker repository key."; } >&2
                 { echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$PLATFORM_NAME $(lsb_release -cs) stable" | $SUDO_CMD tee /etc/apt/sources.list.d/docker.list > /dev/null || fail "Could not add Docker repository."; } >&2
@@ -267,9 +272,10 @@ else
             if [ $? != "0" ]; then
                 >&2 get_escalation_cmd
                 echo "Installing docker-compose-plugin..."
-                if [ ! -f /etc/apt/sources.list.d/docker.list ]; then
-                    # Install the Docker repo, removing the legacy one if it exists
-                    { $SUDO_CMD add-apt-repository --remove "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/$PLATFORM_NAME $(lsb_release -cs) stable"; } 2>/dev/null
+                # Check for an available installation candidate
+                REPO_FOUND=$(apt-cache policy docker-compose-plugin 2>/dev/null | awk '/Candidate:/ {print $2}')
+                if [ -z "$REPO_FOUND" -o "$REPO_FOUND" = "(none)" ]; then
+                    echo "No installation candidate found for docker-compose-plugin. Setting up Docker repository..."
                     { $SUDO_CMD mkdir -p /etc/apt/keyrings || fail "Could not create APT keyrings directory."; } >&2
                     { curl -fsSL "https://download.docker.com/linux/$PLATFORM_NAME/gpg" | $SUDO_CMD gpg --dearmor -o /etc/apt/keyrings/docker.gpg || fail "Could not add docker repository key."; } >&2
                     { echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$PLATFORM_NAME $(lsb_release -cs) stable" | $SUDO_CMD tee /etc/apt/sources.list.d/docker.list > /dev/null || fail "Could not add Docker repository."; } >&2