From bd9950fea45cb40e787837ddc93d82ef41c051d0 Mon Sep 17 00:00:00 2001
From: Owen Ou <o@owenou.com>
Date: Tue, 21 May 2024 00:14:26 -0700
Subject: [PATCH 1/2] Don't override ENTRYPOINT for uptermd-fly build target

---
 Dockerfile.uptermd | 21 ++++++++++-----------
 fly.toml           |  3 +++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.uptermd b/Dockerfile.uptermd
index bd5cf1e1..8dc2f5bb 100644
--- a/Dockerfile.uptermd
+++ b/Dockerfile.uptermd
@@ -12,6 +12,16 @@ RUN --mount=target=. \
     GOOS=$TARGETOS GOARCH=$TARGETARCH go install \
     ./cmd/...
 
+# For fly deployment only
+FROM gcr.io/distroless/static as uptermd-fly
+
+USER nonroot:nonroot
+
+WORKDIR /app
+ENV PATH="/app:${PATH}"
+
+COPY --from=builder /go/bin/uptermd /go/bin/uptermd-fly /app/
+
 FROM gcr.io/distroless/static
 
 USER nonroot:nonroot
@@ -29,14 +39,3 @@ EXPOSE 8080
 EXPOSE 9090
 
 ENTRYPOINT ["uptermd"]
-
-FROM gcr.io/distroless/static as uptermd-fly
-
-USER nonroot:nonroot
-
-WORKDIR /app
-ENV PATH="/app:${PATH}"
-
-COPY --from=builder /go/bin/uptermd /go/bin/uptermd-fly /app/
-
-ENTRYPOINT ["uptermd-fly"]
diff --git a/fly.toml b/fly.toml
index 2fcf2df0..fc4c989f 100644
--- a/fly.toml
+++ b/fly.toml
@@ -6,6 +6,9 @@ kill_timeout = "5s"
 dockerfile = "Dockerfile.uptermd"
 build-target = "uptermd-fly"
 
+[experimental]
+entrypoint = ["uptermd-fly"]
+
 [[services]]
 protocol = "tcp"
 internal_port = 2222

From 41e6d76580ced1f4cc4ed650c51acb44862155b4 Mon Sep 17 00:00:00 2001
From: Owen Ou <o@owenou.com>
Date: Tue, 21 May 2024 00:14:48 -0700
Subject: [PATCH 2/2] Build both amd64 & arm64 images

---
 .github/workflows/docker.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index e3a7fb14..6d2bc9cd 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -37,6 +37,7 @@ jobs:
           pull: true
           file: Dockerfile.uptermd
           tags: ${{ steps.meta.outputs.tags }}
+          platforms: amd64,arm64
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: |
             type=gha