Skip to content

Commit e88ae62

Browse files
authored
Merge pull request #712 from nextcloud/exclude-client-container-from-multi-arch
Exclude client container from multi arch
2 parents 1d3f701 + 2085fa9 commit e88ae62

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/build-test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,15 @@ jobs:
5656
- name: Set up Docker Buildx
5757
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
5858

59-
- name: Build Docker image ${{ matrix.dockerfile }}
59+
# Only build non-client containers as multi-arch containers
60+
- name: Build multi-arch Docker image ${{ matrix.dockerfile }}
61+
if: ${{ !startsWith(matrix.dockerfile, 'client') }}
6062
run: |
6163
cd "$(dirname ${{ matrix.dockerfile }})"
6264
docker buildx build --platform linux/amd64,linux/arm64 . --file Dockerfile
65+
66+
- name: Build amd64 Docker image ${{ matrix.dockerfile }}
67+
if: ${{ startsWith(matrix.dockerfile, 'client') }}
68+
run: |
69+
cd "$(dirname ${{ matrix.dockerfile }})"
70+
docker build . --file Dockerfile

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Build container image
6262
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
6363
with:
64-
platforms: linux/amd64,linux/arm64
64+
platforms: ${{ startsWith(github.event.inputs.folderPath, 'client') && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
6565
push: true
6666
context: ${{ github.event.inputs.folderPath }}
6767
file: '${{ github.event.inputs.folderPath }}/${{ github.event.inputs.dockerFile }}'

0 commit comments

Comments
 (0)