Skip to content

Commit dfb7641

Browse files
committed
fix(ci): Update Docker build steps to use buildx for multi-platform support
Signed-off-by: Magnus Ullberg <magnus@ullberg.us>
1 parent fa57578 commit dfb7641

1 file changed

Lines changed: 21 additions & 10 deletions

File tree

.github/workflows/release.yml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ jobs:
6767

6868
- name: Set up Docker Buildx
6969
uses: docker/setup-buildx-action@v3
70+
with:
71+
driver-opts: network=host
7072

7173
- name: Login to GitHub Container Registry
7274
uses: docker/login-action@v3
@@ -77,9 +79,11 @@ jobs:
7779

7880
- name: Build and Push Controller Image
7981
run: |
80-
make docker-buildx \
81-
IMG=${{ env.CONTROLLER_IMAGE }}:${{ needs.prepare.outputs.version_tag }} \
82-
PLATFORMS=linux/arm64,linux/amd64
82+
docker buildx build \
83+
--push \
84+
--platform=linux/arm64,linux/amd64 \
85+
--tag ${{ env.CONTROLLER_IMAGE }}:${{ needs.prepare.outputs.version_tag }} \
86+
-f Dockerfile .
8387
8488
- name: Tag Latest
8589
run: |
@@ -116,6 +120,8 @@ jobs:
116120

117121
- name: Set up Docker Buildx
118122
uses: docker/setup-buildx-action@v3
123+
with:
124+
driver-opts: network=host
119125

120126
- name: Login to GitHub Container Registry
121127
uses: docker/login-action@v3
@@ -126,9 +132,11 @@ jobs:
126132

127133
- name: Build and Push Plugin Image
128134
run: |
129-
make plugin-buildx \
130-
PLUGIN_IMG=${{ env.PLUGIN_IMAGE }}:${{ needs.prepare.outputs.version_tag }} \
131-
PLATFORMS=linux/arm64,linux/amd64
135+
docker buildx build \
136+
--push \
137+
--platform=linux/arm64,linux/amd64 \
138+
--tag ${{ env.PLUGIN_IMAGE }}:${{ needs.prepare.outputs.version_tag }} \
139+
object-lease-console-plugin
132140
133141
- name: Tag Latest
134142
run: |
@@ -152,6 +160,8 @@ jobs:
152160

153161
- name: Set up Docker Buildx
154162
uses: docker/setup-buildx-action@v3
163+
with:
164+
driver-opts: network=host
155165

156166
- name: Login to GitHub Container Registry
157167
uses: docker/login-action@v3
@@ -163,10 +173,11 @@ jobs:
163173
- name: Build and Push Operator Image
164174
working-directory: object-lease-operator
165175
run: |
166-
make docker-buildx \
167-
IMG=${{ env.OPERATOR_IMAGE }}:${{ needs.prepare.outputs.version_tag }} \
168-
VERSION=${{ needs.prepare.outputs.version }} \
169-
PLATFORMS=linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
176+
docker buildx build \
177+
--push \
178+
--platform=linux/arm64,linux/amd64,linux/s390x,linux/ppc64le \
179+
--tag ${{ env.OPERATOR_IMAGE }}:${{ needs.prepare.outputs.version_tag }} \
180+
-f Dockerfile .
170181
171182
- name: Tag Latest
172183
run: |

0 commit comments

Comments
 (0)