TUN-6652: Publish dockerfile for both amd64 and arm64
This change seeks to push an arm64 built image to dockerhub for arm users to run. This should spin cloudflared on arm machines without the warning WARNING: The requested image's platform (linux/amd64) does not match the detected host platform (linux/arm64/v8) and no specific platform was requested
This commit is contained in:
parent
88235356d5
commit
0538953a39
|
@ -1,6 +1,6 @@
|
||||||
images:
|
images:
|
||||||
- name: cloudflared
|
- name: cloudflared
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile.$ARCH
|
||||||
context: .
|
context: .
|
||||||
versions:
|
versions:
|
||||||
- latest
|
- latest
|
||||||
|
@ -8,3 +8,6 @@ images:
|
||||||
- name: docker.io/cloudflare
|
- name: docker.io/cloudflare
|
||||||
user: env:DOCKER_USER
|
user: env:DOCKER_USER
|
||||||
password: env:DOCKER_PASSWORD
|
password: env:DOCKER_PASSWORD
|
||||||
|
architectures:
|
||||||
|
- amd64
|
||||||
|
- arm64
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# use a builder image for building cloudflare
|
# use a builder image for building cloudflare
|
||||||
ARG TARGET_GOOS
|
ARG TARGET_GOOS
|
||||||
ARG TARGET_GOARCH
|
ARG TARGET_GOARCH
|
||||||
FROM golang:1.18.1 as builder
|
FROM golang:1.19 as builder
|
||||||
ENV GO111MODULE=on \
|
ENV GO111MODULE=on \
|
||||||
CGO_ENABLED=0 \
|
CGO_ENABLED=0 \
|
||||||
TARGET_GOOS=${TARGET_GOOS} \
|
TARGET_GOOS=${TARGET_GOOS} \
|
||||||
|
@ -18,7 +18,7 @@ COPY . .
|
||||||
RUN make cloudflared
|
RUN make cloudflared
|
||||||
|
|
||||||
# use a distroless base image with glibc
|
# use a distroless base image with glibc
|
||||||
FROM gcr.io/distroless/base-debian10:nonroot
|
FROM gcr.io/distroless/base-debian11:nonroot
|
||||||
|
|
||||||
# copy our compiled binary
|
# copy our compiled binary
|
||||||
COPY --from=builder --chown=nonroot /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/
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
# use a builder image for building cloudflare
|
||||||
|
FROM golang:1.19 as builder
|
||||||
|
ENV GO111MODULE=on \
|
||||||
|
CGO_ENABLED=0
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
|
||||||
|
|
||||||
|
WORKDIR /go/src/github.com/cloudflare/cloudflared/
|
||||||
|
|
||||||
|
# copy our sources into the builder image
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# compile cloudflared
|
||||||
|
RUN GOOS=linux GOARCH=amd64 make cloudflared
|
||||||
|
|
||||||
|
# use a distroless base image with glibc
|
||||||
|
FROM gcr.io/distroless/base-debian11:nonroot
|
||||||
|
|
||||||
|
# copy our compiled binary
|
||||||
|
COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
|
||||||
|
|
||||||
|
# run as non-privileged user
|
||||||
|
USER nonroot
|
||||||
|
|
||||||
|
# command / entrypoint of container
|
||||||
|
ENTRYPOINT ["cloudflared", "--no-autoupdate"]
|
||||||
|
CMD ["version"]
|
|
@ -0,0 +1,27 @@
|
||||||
|
# use a builder image for building cloudflare
|
||||||
|
FROM golang:1.19 as builder
|
||||||
|
ENV GO111MODULE=on \
|
||||||
|
CGO_ENABLED=0
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared"
|
||||||
|
|
||||||
|
WORKDIR /go/src/github.com/cloudflare/cloudflared/
|
||||||
|
|
||||||
|
# copy our sources into the builder image
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# compile cloudflared
|
||||||
|
RUN GOOS=linux GOARCH=arm64 make cloudflared
|
||||||
|
|
||||||
|
# use a distroless base image with glibc
|
||||||
|
FROM gcr.io/distroless/base-debian11:nonroot
|
||||||
|
|
||||||
|
# copy our compiled binary
|
||||||
|
COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
|
||||||
|
|
||||||
|
# run as non-privileged user
|
||||||
|
USER nonroot
|
||||||
|
|
||||||
|
# command / entrypoint of container
|
||||||
|
ENTRYPOINT ["cloudflared", "--no-autoupdate"]
|
||||||
|
CMD ["version"]
|
Loading…
Reference in New Issue