Merge pull request #2984 from diginc/development

Adding docker+arm detection & FTL download

automated install/basic-install.sh

@@ -2332,9 +2332,15 @@ get_binary_name() {
                 l_binary="pihole-FTL-arm-linux-gnueabi"
             fi
         else
-            printf "%b  %b Detected ARM architecture\\n" "${OVER}" "${TICK}"
+            if [[ -f "/.dockerenv" ]]; then
-            # set the binary to be used
+                printf "%b  %b Detected ARM architecture in docker\\n" "${OVER}" "${TICK}"
-            l_binary="pihole-FTL-arm-linux-gnueabi"
+                # set the binary to be used
+                binary="pihole-FTL-armel-native"
+            else
+                printf "%b  %b Detected ARM architecture\\n" "${OVER}" "${TICK}"
+                # set the binary to be used
+                binary="pihole-FTL-arm-linux-gnueabi"
+            fi
         fi
     elif [[ "${machine}" == "x86_64" ]]; then
         # This gives the architecture of packages dpkg installs (for example, "i386")