Skip to content

Commit 093fd32

Browse files
phlogistonjohnmergify[bot]
authored andcommitted
github: import images to k3d with one command
Signed-off-by: John Mulligan <[email protected]>
1 parent a6022f2 commit 093fd32

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.github/workflows/container-image.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,13 @@ jobs:
234234
with:
235235
image: "samba-ad-server:${{ env.IMG_TAG }}"
236236
container_engine: ${{ env.CONTAINER_CMD }}
237-
- name: import ad server image
238-
run: k3d image import samba-ad-server:${{ env.IMG_TAG }}
239237
- name: Download file server image
240238
uses: ishworkh/[email protected]
241239
with:
242240
image: "samba-server:${{ env.IMG_TAG }}"
243241
container_engine: ${{ env.CONTAINER_CMD }}
244-
- name: import file server image
245-
run: k3d image import samba-server:${{ env.IMG_TAG }}
242+
- name: import images to k3d
243+
run: k3d image import samba-server:${{ env.IMG_TAG }} samba-ad-server:${{ env.IMG_TAG }}
246244
- name: run the ad-dc deployment test
247245
run: ./tests/test-samba-ad-server-kubernetes.sh
248246

@@ -269,15 +267,13 @@ jobs:
269267
with:
270268
image: "samba-ad-server:${{ env.IMG_TAG }}"
271269
container_engine: ${{ env.CONTAINER_CMD }}
272-
- name: import nightly ad server image
273-
run: k3d image import samba-ad-server:${{ env.IMG_TAG }}
274270
- name: Download nightly file server image
275271
uses: ishworkh/[email protected]
276272
with:
277273
image: "samba-server:${{ env.IMG_TAG }}"
278274
container_engine: ${{ env.CONTAINER_CMD }}
279-
- name: import nightly file server image
280-
run: k3d image import samba-server:${{ env.IMG_TAG }}
275+
- name: import images to k3d
276+
run: k3d image import samba-server:${{ env.IMG_TAG }} samba-ad-server:${{ env.IMG_TAG }}
281277
- name: run the ad-dc deployment test
282278
run: ./tests/test-samba-ad-server-kubernetes.sh
283279

0 commit comments

Comments
 (0)