move arm to distroless and share dockerfile for releases

pomerium · Dec 2, 2020 · 93f3ddf · 93f3ddf
1 parent 22e1b53
commit 93f3ddf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 38 deletions.
diff --git a/.github/Dockerfile-release b/.github/Dockerfile-release
@@ -1,7 +1,9 @@
+ARG ARCH
+
 FROM busybox:latest as build
 RUN touch /config.yaml
 
-FROM gcr.io/distroless/base
+FROM gcr.io/distroless/base-debian10:latest-${ARCH}
 ENV AUTOCERT_DIR /data/autocert
 WORKDIR /pomerium
 COPY pomerium* /bin/

diff --git a/.github/Dockerfile-release.arm32v6 b/.github/Dockerfile-release.arm32v6
diff --git a/.github/Dockerfile-release.arm32v7 b/.github/Dockerfile-release.arm32v7
diff --git a/.github/Dockerfile-release.arm64v8 b/.github/Dockerfile-release.arm64v8
diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
@@ -108,6 +108,7 @@ dockers:
       - pomerium-cli
     build_flag_templates:
       - "--pull"
+      - "--build-arg=ARCH=amd64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.name={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
@@ -134,12 +135,13 @@ dockers:
   - goarch: arm64
     image_templates:
       - "pomerium/pomerium:arm64v8-{{ .Tag }}"
-    dockerfile: .github/Dockerfile-release.arm64v8
+    dockerfile: .github/Dockerfile-release
     binaries:
       - pomerium
       - pomerium-cli
     build_flag_templates:
       - "--pull"
+      - "--build-arg=ARCH=arm64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.name={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"