Skip to content

Commit dee4e69

Browse files
committed
workflows: build and push arm64 fedora images
Extend build matrix to include fedora arm64 images with default package source. Signed-off-by: Alexander Bachmann <[email protected]>
1 parent 643796e commit dee4e69

File tree

1 file changed

+50
-0
lines changed

1 file changed

+50
-0
lines changed

.github/workflows/container-image.yml

+50
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ jobs:
5454
- package_source: devbuilds
5555
os: centos
5656
arch: amd64
57+
- package_source: default
58+
os: fedora
59+
arch: arm64
5760
runs-on: ubuntu-latest
5861
env:
5962
BUILDAH_FORMAT: oci
@@ -82,6 +85,10 @@ jobs:
8285
# the distro packages for centos do not include an ad-dc
8386
- package_source: default
8487
os: centos
88+
include:
89+
- package_source: default
90+
os: fedora
91+
arch: arm64
8592
runs-on: ubuntu-latest
8693
env:
8794
BUILDAH_FORMAT: oci
@@ -102,6 +109,10 @@ jobs:
102109
matrix:
103110
os: [centos, fedora, opensuse]
104111
arch: [amd64]
112+
include:
113+
- package_source: default
114+
os: fedora
115+
arch: arm64
105116
runs-on: ubuntu-latest
106117
env:
107118
BUILDAH_FORMAT: oci
@@ -123,6 +134,10 @@ jobs:
123134
matrix:
124135
os: [centos, fedora, opensuse]
125136
arch: [amd64]
137+
include:
138+
- package_source: default
139+
os: fedora
140+
arch: arm64
126141
needs: build-client
127142
runs-on: ubuntu-latest
128143
env:
@@ -167,6 +182,9 @@ jobs:
167182
- package_source: devbuilds
168183
os: centos
169184
arch: amd64
185+
- package_source: default
186+
os: fedora
187+
arch: arm64
170188
needs: build-server
171189
runs-on: ubuntu-latest
172190
env:
@@ -195,6 +213,10 @@ jobs:
195213
# the distro packages for centos do not include an ad-dc
196214
- package_source: default
197215
os: centos
216+
include:
217+
- package_source: default
218+
os: fedora
219+
arch: arm64
198220
needs:
199221
- build-ad-server
200222
- build-server
@@ -250,6 +272,11 @@ jobs:
250272
with:
251273
image: "samba-server:default-fedora-amd64"
252274
container_engine: ${{ env.CONTAINER_CMD }}
275+
- name: Fetch server default-fedora-arm64
276+
uses: ishworkh/[email protected]
277+
with:
278+
image: "samba-server:default-fedora-arm64"
279+
container_engine: ${{ env.CONTAINER_CMD }}
253280
- name: Fetch server nightly-fedora-amd64
254281
uses: ishworkh/[email protected]
255282
with:
@@ -271,6 +298,11 @@ jobs:
271298
with:
272299
image: "samba-ad-server:default-fedora-amd64"
273300
container_engine: ${{ env.CONTAINER_CMD }}
301+
- name: Fetch ad-server default-fedora-arm64
302+
uses: ishworkh/[email protected]
303+
with:
304+
image: "samba-ad-server:default-fedora-arm64"
305+
container_engine: ${{ env.CONTAINER_CMD }}
274306
- name: Fetch ad-server nightly-fedora-amd64
275307
uses: ishworkh/[email protected]
276308
with:
@@ -282,12 +314,22 @@ jobs:
282314
with:
283315
image: "samba-client:default-fedora-amd64"
284316
container_engine: ${{ env.CONTAINER_CMD }}
317+
- name: Fetch client default-fedora-arm64
318+
uses: ishworkh/[email protected]
319+
with:
320+
image: "samba-client:default-fedora-arm64"
321+
container_engine: ${{ env.CONTAINER_CMD }}
285322
# (toolbox images)
286323
- name: Fetch toolbox default-fedora-amd64
287324
uses: ishworkh/[email protected]
288325
with:
289326
image: "samba-toolbox:default-fedora-amd64"
290327
container_engine: ${{ env.CONTAINER_CMD }}
328+
- name: Fetch toolbox default-fedora-arm64
329+
uses: ishworkh/[email protected]
330+
with:
331+
image: "samba-toolbox:default-fedora-arm64"
332+
container_engine: ${{ env.CONTAINER_CMD }}
291333
# reapply missing tags
292334
- name: Retag images
293335
run: >
@@ -297,13 +339,17 @@ jobs:
297339
--repo-base=${REPO_BASE}
298340
--no-distro-qualified
299341
-i samba-server:default-fedora-amd64
342+
-i samba-server:default-fedora-arm64
300343
-i samba-server:nightly-fedora-amd64
301344
-i samba-server:nightly-centos-amd64
302345
-i samba-server:devbuilds-centos-amd64
303346
-i samba-ad-server:default-fedora-amd64
347+
-i samba-ad-server:default-fedora-arm64
304348
-i samba-ad-server:nightly-fedora-amd64
305349
-i samba-client:default-fedora-amd64
350+
-i samba-client:default-fedora-arm64
306351
-i samba-toolbox:default-fedora-amd64
352+
-i samba-toolbox:default-fedora-arm64
307353
- name: Push images
308354
run: >
309355
./hack/build-image
@@ -313,10 +359,14 @@ jobs:
313359
--push-state=exists
314360
--push-selected-tags=mixed
315361
-i ${REPO_BASE}/samba-server:default-fedora-amd64
362+
-i ${REPO_BASE}/samba-server:default-fedora-arm64
316363
-i ${REPO_BASE}/samba-server:nightly-fedora-amd64
317364
-i ${REPO_BASE}/samba-server:nightly-centos-amd64
318365
-i ${REPO_BASE}/samba-server:devbuilds-centos-amd64
319366
-i ${REPO_BASE}/samba-ad-server:default-fedora-amd64
367+
-i ${REPO_BASE}/samba-ad-server:default-fedora-arm64
320368
-i ${REPO_BASE}/samba-ad-server:nightly-fedora-amd64
321369
-i ${REPO_BASE}/samba-client:default-fedora-amd64
370+
-i ${REPO_BASE}/samba-client:default-fedora-arm64
322371
-i ${REPO_BASE}/samba-toolbox:default-fedora-amd64
372+
-i ${REPO_BASE}/samba-toolbox:default-fedora-arm64

0 commit comments

Comments
 (0)