Tidy up previous build files

glanceapp · Aug 7, 2024 · f9ea2d7 · f9ea2d7
1 parent a5728e9
commit f9ea2d7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 323 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
-FROM alpine:3.20
+FROM golang:1.22.5-alpine3.20 AS builder
+
+WORKDIR /app
+COPY . /app
+RUN CGO_ENABLED=0 go build .
 
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
+FROM alpine:3.20
 
 WORKDIR /app
-COPY build/glance-$TARGETOS-$TARGETARCH${TARGETVARIANT} /app/glance
+COPY --from=builder /app/glance .
 
 EXPOSE 8080/tcp
 ENTRYPOINT ["/app/glance"]
diff --git a/Dockerfile.single-platform b/Dockerfile.single-platform
diff --git a/README.md b/README.md
@@ -101,7 +101,7 @@ Build the image:
 **Make sure to replace "owner" with your name or organization.**
 
 ```bash
-docker build -t owner/glance:latest -f Dockerfile.single-platform .
+docker build -t owner/glance:latest .
 ```
 
 Push the image to your registry:

diff --git a/scripts/build-and-ship/main.go b/scripts/build-and-ship/main.go