🌱 simplify dotnet provider builds (#569)

Signed-off-by: David Zager <[email protected]>
konveyor · Apr 8, 2024 · b8e8ebf · b8e8ebf
1 parent 988268d
commit b8e8ebf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml
@@ -25,16 +25,18 @@ jobs:
               TAG=${GITHUB_REF_NAME/main/latest}
               sed -i "s,FROM quay.io/konveyor/jdtls-server-base,FROM quay.io/konveyor/jdtls-server-base:${TAG}," Dockerfile
             context: "."
+            architectures: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
           - name: dotnet-external-provider
             containerfile: "./external-providers/dotnet-external-provider/Dockerfile"
             context: "./external-providers/dotnet-external-provider"
+            architectures: '[ "amd64", "arm64" ]'
     uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main
     with:
       registry: "quay.io/konveyor"
       image_name: ${{ matrix.images.name }}
       containerfile: ${{ matrix.images.containerfile }}
       pre_build_cmd: ${{ matrix.images.pre_build_cmd }}
-      architectures: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
+      architectures: ${{ matrix.images.architectures }}
       context: ${{ matrix.images.context }}
     secrets:
       registry_username: ${{ secrets.QUAY_PUBLISH_ROBOT }}

diff --git a/external-providers/dotnet-external-provider/Dockerfile b/external-providers/dotnet-external-provider/Dockerfile
@@ -10,8 +10,7 @@ COPY pkg/ ./pkg
 RUN go mod download
 
 RUN make build
-RUN ADD_PLAT=yes OS=windows ARCH=amd64 make build
-RUN ADD_PLAT=yes OS=windows ARCH=arm64 make build
+RUN ADD_PLAT=yes OS=windows make build
 
 # TODO(djzager): resurrect if we need omnisharp-roslyn
 # FROM registry.access.redhat.com/ubi8/dotnet-70 AS builder