diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 7cbd202..1368fb8 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -38,8 +38,6 @@ jobs: - name: Setup Blacksmith Builder uses: useblacksmith/setup-docker-builder@v1 - with: - platforms: linux/amd64,linux/arm64 - name: Build and push Docker image uses: useblacksmith/build-push-action@v2 diff --git a/Dockerfile b/Dockerfile index fdb5bbe..981690e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM oven/bun:1 AS frontend-builder +FROM oven/bun:1 AS frontend-builder WORKDIR /app/web COPY web/package.json web/bun.lock ./ @@ -6,31 +6,17 @@ RUN bun install COPY web/ ./ RUN bun run build -FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS backend-builder +FROM golang:1.25-alpine AS backend-builder -ARG BUILDPLATFORM -ARG TARGETPLATFORM -ARG TARGETOS -ARG TARGETARCH - -RUN apk add --no-cache gcc musl-dev \ - && if [ "$TARGETARCH" = "arm64" ] && [ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]; then \ - apk add --no-cache aarch64-linux-musl-cross; \ - fi +RUN apk add --no-cache gcc musl-dev WORKDIR /app COPY backend/go.mod backend/go.sum ./ RUN go mod download COPY backend/ ./ -RUN if [ "$TARGETARCH" = "arm64" ] && [ "$BUILDPLATFORM" != "$TARGETPLATFORM" ]; then \ - CC=aarch64-linux-musl-gcc \ - CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH \ - go build -a -ldflags '-linkmode external -extldflags "-static"' -o margin-server ./cmd/server; \ - else \ - CGO_ENABLED=1 GOOS=$TARGETOS GOARCH=$TARGETARCH \ - go build -a -ldflags '-linkmode external -extldflags "-static"' -o margin-server ./cmd/server; \ - fi +RUN CGO_ENABLED=1 GOOS=linux go build -a -ldflags '-linkmode external -extldflags "-static"' -o margin-server ./cmd/server + FROM node:20-alpine