From 019df0f616d970ae7791691dc40ca2c3c0bcaf17 Mon Sep 17 00:00:00 2001
From: Jonny Stoten <jonny.stoten@docker.com>
Date: Mon, 1 Jul 2024 10:50:18 +0100
Subject: [PATCH] Add production stage to Dockerfile and tidy up

---
 Dockerfile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 72c40a7..28f656c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,37 @@
 ARG BUILDERIMAGE="golang:1.22"
 ARG BASEIMAGE="gcr.io/distroless/static:nonroot"
 
-FROM ${BUILDERIMAGE} as builder
+FROM ${BUILDERIMAGE} AS builder
 
-ARG LDFLAGS
-
-ENV GO111MODULE=on \
-  CGO_ENABLED=0
+ENV CGO_ENABLED=0
 
 WORKDIR /app
 
-COPY . .
-
-# --- This block can be replaced by `RUN go mod download` when github.com/docker/attest is public
+# --- This block can be removed when github.com/docker/attest is public
 ENV GOPRIVATE="github.com/docker/attest"
-RUN --mount=type=cache,target=$GOPATH/pkg/mod --mount=type=secret,id=GITHUB_TOKEN <<EOT
+RUN --mount=type=secret,id=GITHUB_TOKEN <<EOT
   set -e
   GITHUB_TOKEN=${GITHUB_TOKEN:-$(cat /run/secrets/GITHUB_TOKEN)}
   if [ -n "$GITHUB_TOKEN" ]; then
     echo "Setting GitHub access token"
     git config --global "url.https://x-access-token:${GITHUB_TOKEN}@github.com.insteadof" "https://github.com"
   fi
-  go mod download
 EOT
 # ---
 
-RUN --mount=type=cache,target=$GOPATH/pkg/mod --mount=type=cache,target=/root/.cache/go-build make build
+RUN --mount=type=bind,source=.,target=/app \
+    --mount=type=cache,target=$GOPATH/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    go build -o /bin/attest main.go
 
-FROM ${BASEIMAGE}
+FROM ${BASEIMAGE} AS production
 
-COPY --from=builder /app/bin/attest /
-
-COPY --from=builder --chown=65532:65532 /app/certs/tls.crt /app/certs/tls.key /certs/
+COPY --from=builder /bin/attest /
 
 USER 65532:65532
 
 ENTRYPOINT ["/attest"]
+
+FROM production AS dev
+
+COPY certs/tls.crt certs/tls.key /certs/