Target OS

gimlet-io · Oct 5, 2024 · 62c6439 · 62c6439
1 parent c05e108
commit 62c6439
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,13 +39,14 @@ jobs:
       #     env.no_proxy=168.63.129.16/32
       with:
         endpoint: tcp://88.99.211.150:2375
+        # endpoint: ssh://88.99.211.150:2222
     - name: Build Capacitor image
       id: build
       uses: docker/build-push-action@v6
       with:
         context: .
         file: docker/Dockerfile.multistage
-        platforms: linux/amd64,linux/arm64/v8
+        platforms: linux/amd64 #,linux/arm64/v8
         push: false
         tags: |
           ghcr.io/gimlet-io/capacitor:build

diff --git a/docker/Dockerfile.multistage b/docker/Dockerfile.multistage
@@ -5,7 +5,7 @@ WORKDIR /go/src/github.com/gimlet-io/capacitor
 COPY . .
 
 RUN mkdir -p bin
-RUN GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -o bin/linux/amd64/capacitor github.com/gimlet-io/capacitor/cmd/capacitor
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -installsuffix cgo -o bin/$TARGETOS/$TARGETARCH/capacitor github.com/gimlet-io/capacitor/cmd/capacitor
 
 FROM node:22-alpine AS npmbuild
 
@@ -26,10 +26,7 @@ RUN mkdir /var/lib/capacitor
 RUN chown capacitor:capacitor /var/lib/capacitor
 WORKDIR /capacitor
 
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
-COPY --from=gobuild --chown=capacitor:capacitor /go/src/github.com/gimlet-io/capacitor/bin/linux/amd64/capacitor capacitor
+COPY --from=gobuild --chown=capacitor:capacitor /go/src/github.com/gimlet-io/capacitor/bin/$TARGETOS/$TARGETARCH/capacitor capacitor
 COPY --from=npmbuild --chown=capacitor:capacitor /src/build ./web/build/
 
 USER capacitor