Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cloudflared #138

Merged
merged 4 commits into from
Jan 7, 2024
Merged

Add cloudflared #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a3afeb
Add cloudflared
samuelleb11 Jan 2, 2024
3fb488e
Versioned installation + architecture depended
frenck Jan 7, 2024
3bd8eae
Style
frenck Jan 7, 2024
4eb0d10
Let Renovate handle the upgrades of CloudFlared
frenck Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@
],
"datasourceTemplate": "github-releases",
"depNameTemplate": "louislam/uptime-kuma"
},
{
"fileMatch": ["/Dockerfile$"],
"matchStrings": [
"ARG CLOUDFLARED_VERSION=[\"']?(?<currentValue>.+?)[\"']?\\s+"
],
"datasourceTemplate": "github-releases",
"depNameTemplate": "cloudflare/cloudflared",
"versioningTemplate": "loose"
}
],
"packageRules": [
Expand Down
11 changes: 9 additions & 2 deletions uptime-kuma/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Setup base
ARG UPTIME_KUMA_VERSION="1.23.11"
ARG CLOUDFLARED_VERSION="2023.10.0"
ARG BUILD_ARCH=amd64
# hadolint ignore=DL3003,DL3042
RUN \
apk add --no-cache --virtual .build-dependencies \
Expand All @@ -39,6 +41,13 @@ RUN \
--omit=dev \
&& npm run download-dist \
\
&& if [ "${BUILD_ARCH}" = "aarch64" ]; then CLOUDFLARED_ARCH="arm64"; \
elif [ "${BUILD_ARCH}" = "amd64" ]; then CLOUDFLARED_ARCH="amd64"; \
elif [ "${BUILD_ARCH}" = "armv7" ]; then CLOUDFLARED_ARCH="arm"; fi \
&& curl -L --fail -o /usr/bin/cloudflared \
"https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-${CLOUDFLARED_ARCH}" \
&& chmod +x /usr/bin/cloudflared \
\
&& npm cache clear --force \
\
&& apk del --no-cache --purge .build-dependencies \
Expand All @@ -48,12 +57,10 @@ RUN \
/root/.npm \
/root/.npmrc


# Copy root filesystem
COPY rootfs /

# Build arguments
ARG BUILD_ARCH
ARG BUILD_DATE
ARG BUILD_DESCRIPTION
ARG BUILD_NAME
Expand Down