diff --git a/Cloudflared/2024.8.2/Dockerfile b/Cloudflared/2024.8.2/Dockerfile index 0c716b8..32d1928 100644 --- a/Cloudflared/2024.8.2/Dockerfile +++ b/Cloudflared/2024.8.2/Dockerfile @@ -13,21 +13,16 @@ RUN git clone --branch ${CLOUDFLARED_VERSION} --single-branch --depth 1 https:// RUN GOOS=linux GOARCH=${TARGETARCH} make cloudflared # use a distroless base image with glibc -FROM debian:bookworm-slim +FROM gcr.io/distroless/base-debian11:nonroot LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" -RUN apt-get update && \ - apt-get install -qq --no-install-recommends iproute2 && \ - rm -rf /var/lib/apt/lists/* - # copy our compiled binary -COPY --from=builder /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user -COPY docker-entrypoint.sh docker-entrypoint.sh +USER nonroot # command / entrypoint of container - -ENTRYPOINT [ "./docker-entrypoint.sh" ] +ENTRYPOINT ["cloudflared", "--no-autoupdate"] CMD ["version"] diff --git a/Cloudflared/2024.8.2/docker-entrypoint.sh b/Cloudflared/2024.8.2/docker-entrypoint.sh deleted file mode 100755 index e9a1e90..0000000 --- a/Cloudflared/2024.8.2/docker-entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -echo "$(/sbin/ip route|awk '/default/ { print $3 }') host.docker.internal" >> /etc/hosts - -exec cloudflared --no-autoupdate "$@"