diff --git a/.goreleaser.yml b/.goreleaser.yml index 16dafd6..3f0086d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -54,7 +54,7 @@ dockers: use: buildx goos: linux goarch: amd64 - dockerfile: Dockerfile.goreleaser + dockerfile: Dockerfile build_flag_templates: - "--platform=linux/amd64" - image_templates: @@ -62,7 +62,7 @@ dockers: use: buildx goos: linux goarch: arm64 - dockerfile: Dockerfile.goreleaser + dockerfile: Dockerfile build_flag_templates: - "--platform=linux/arm64" diff --git a/Dockerfile b/Dockerfile index 931e494..b7f04b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,4 @@ -FROM debian:buster-slim AS build - -WORKDIR /tmp -ARG GCSPROXY_VERSION=0.4.2 - -RUN apt-get update \ - && apt-get install --no-install-suggests --no-install-recommends --yes ca-certificates wget \ - && wget https://github.com/daichirata/gcsproxy/releases/download/v${GCSPROXY_VERSION}/gcsproxy-${GCSPROXY_VERSION}-linux-amd64.tar.gz \ - && tar zxf gcsproxy-${GCSPROXY_VERSION}-linux-amd64.tar.gz \ - && cp ./gcsproxy-${GCSPROXY_VERSION}-linux-amd64/gcsproxy . - FROM gcr.io/distroless/base -COPY --from=build /tmp/gcsproxy /gcsproxy +COPY gcsproxy /gcsproxy ENTRYPOINT ["/gcsproxy"] CMD [ "-b", "0.0.0.0:80" ] diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser deleted file mode 100644 index b7f04b1..0000000 --- a/Dockerfile.goreleaser +++ /dev/null @@ -1,4 +0,0 @@ -FROM gcr.io/distroless/base -COPY gcsproxy /gcsproxy -ENTRYPOINT ["/gcsproxy"] -CMD [ "-b", "0.0.0.0:80" ]