diff --git a/stash/Dockerfile.amd64 b/stash/Dockerfile similarity index 87% rename from stash/Dockerfile.amd64 rename to stash/Dockerfile index 20a6bfc..6b718f1 100644 --- a/stash/Dockerfile.amd64 +++ b/stash/Dockerfile @@ -3,7 +3,6 @@ FROM golang:alpine AS builder LABEL stage=gobuilder ENV CGO_ENABLED 0 -ENV GOOS linux ENV GOPROXY https://goproxy.cn,direct RUN apk update --no-cache && apk add --no-cache tzdata @@ -15,7 +14,7 @@ ADD go.sum . RUN go mod download COPY . . COPY stash/etc /app/etc -RUN GOARCH=amd64 go build -ldflags="-s -w" -o /app/stash stash/stash.go +RUN go build -ldflags="-s -w" -o /app/stash stash/stash.go FROM scratch diff --git a/stash/Dockerfile.arm64 b/stash/Dockerfile.arm64 deleted file mode 100644 index e3edbf7..0000000 --- a/stash/Dockerfile.arm64 +++ /dev/null @@ -1,31 +0,0 @@ -FROM golang:alpine AS builder - -LABEL stage=gobuilder - -ENV CGO_ENABLED 0 -ENV GOOS linux -ENV GOPROXY https://goproxy.cn,direct - -RUN apk update --no-cache && apk add --no-cache tzdata - -WORKDIR /build - -ADD go.mod . -ADD go.sum . -RUN go mod download -COPY . . -COPY stash/etc /app/etc -RUN GOARCH=arm64 go build -ldflags="-s -w" -o /app/stash stash/stash.go - - -FROM scratch - -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /usr/share/zoneinfo/Asia/Shanghai -ENV TZ Asia/Shanghai - -WORKDIR /app -COPY --from=builder /app/stash /app/stash -COPY --from=builder /app/etc /app/etc - -CMD ["./stash", "-f", "etc/config.yaml"]