LAB-linuxserver/docker-mods
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-mods.git synced 2026-03-23 00:05:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

deprecate armhf, use go 1.20 to build

Browse Source
This commit is contained in:
aptalca 2023-08-31 19:55:09 -04:00
parent e88fd69436
commit 24c135fd1b
No known key found for this signature in database
GPG Key ID: BE36CFFB9FD85548
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -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 ##

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

@ -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

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

@ -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