From 1e054e321f238d9c5139a91a5f4cf85fb1b2d78d Mon Sep 17 00:00:00 2001 From: Torsten Widmann Date: Tue, 26 Sep 2023 17:36:31 +0200 Subject: [PATCH] add cloudflared arm64 (#189) * add cloudflared arm64 * typo * print cloudflared version on startup --------- Co-authored-by: gOOvER <116325+gOOvER@users.noreply.github.com> Co-authored-by: Quinten <67589015+QuintenQVD0@users.noreply.github.com> --- apps/uptimekuma/Dockerfile | 8 +++++--- apps/uptimekuma/entrypoint.sh | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/uptimekuma/Dockerfile b/apps/uptimekuma/Dockerfile index a206e18..05e5ae0 100644 --- a/apps/uptimekuma/Dockerfile +++ b/apps/uptimekuma/Dockerfile @@ -32,9 +32,11 @@ RUN apk add --no-cache \ # updating npm RUN npm install npm@latest -g -# add cloudflare repo -RUN curl -L https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 -o /usr/bin/cloudflared \ - && chmod+x /usr/bin/cloudflared +# download cloudflared +ARG TARGETPLATFORM +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; fi \ + && curl -L https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCHITECTURE} -o /usr/bin/cloudflared +RUN chmod +x /usr/bin/cloudflared ## Setup user and working directory RUN adduser -D -h /home/container container -s /bin/bash container diff --git a/apps/uptimekuma/entrypoint.sh b/apps/uptimekuma/entrypoint.sh index 0d9fb72..200fb3a 100644 --- a/apps/uptimekuma/entrypoint.sh +++ b/apps/uptimekuma/entrypoint.sh @@ -28,6 +28,7 @@ echo -e "${BLUE}-------------------------------------------------${NC}" echo -e "${YELLOW}Running on Alpine: ${RED} $(cat /etc/alpine-release)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/localtime)${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" +echo -e "${YELLOW}Cloudflared Version: ${RED} $(/usr/bin/cloudflared --version) ${NC}" echo -e "${BLUE}-------------------------------------------------${NC}" # Replace Startup Variables