Merge pull request #758 from linuxserver/universal-cloudflared-armhf

deprecate armhf, use go 1.20 to build

Author: aptalca

Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # Build container
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18 AS buildstage
 
 ARG MOD_VERSION
 
@@ -32,9 +32,6 @@ RUN mv cloudflared /root-layer/cloudflared/cloudflared-amd64
 RUN GOOS=linux GOARCH=arm64 make cloudflared
 RUN mv cloudflared /root-layer/cloudflared/cloudflared-arm64
 
-RUN GOOS=linux GOARCH=arm make cloudflared
-RUN mv cloudflared /root-layer/cloudflared/cloudflared-armhf
-
 COPY root/ /root-layer/
 
 ## Single layer deployed image ##

root/etc/s6-overlay/s6-rc.d/init-mod-universal-cloudflared-setup/run

@@ -9,7 +9,8 @@ if [ "${ARCH}" = "x86_64" ]; then
 elif [ "${ARCH}" = "aarch64" ]; then 
   ARCH="arm64" 
 elif [ "${ARCH}" = "armv7l" ]; then 
-  ARCH="armhf" 
+  echo "**** The universal cloudflared mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
+  exit 0
 else
   echo "**** Unsupported Linux architecture ${ARCH} found, exiting... ****"
   exit 1
@@ -18,9 +19,6 @@ echo "**** Linux architecture found: ${ARCH} ****"
 
 echo "**** Checking for cloudflared setup script dependencies... ****"
 YQARCH="${ARCH}"
-if [ "${YQ_ARCH}" = "armhf" ]; then 
-  YQARCH="arm" 
-fi
 echo "**** Temporarily installing /tmp/yq... ****"
 curl -sLo /tmp/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${YQARCH}
 chmod +x /tmp/yq

root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cloudflared/run

@@ -1,5 +1,10 @@
 #!/usr/bin/with-contenv bash
 
+if [[ $(uname -m) = "armv7l" ]]; then
+  echo "**** The universal cloudflared mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
+  sleep infinity
+fi
+
 if [[ ${#CF_ZONE_ID} -gt 0 ]] && [[ ${#CF_ACCOUNT_ID} -gt 0 ]] && [[ ${#CF_API_TOKEN} -gt 0 ]] && [[ ${#CF_TUNNEL_NAME} -gt 0 ]] && [[ ${#CF_TUNNEL_CONFIG} -gt 0 ]] && [[ ${#CF_TUNNEL_PASSWORD} -gt 31 ]]; then
     exec s6-setuidgid abc cloudflared tunnel --no-autoupdate --config /etc/cloudflared/config.yml run
 else