Skip to content

Commit 89f138c

Browse files
anoopcs9obnoxxx
authored andcommitted
1 parent d8fdc4f commit 89f138c

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

.github/workflows/container-image.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ jobs:
4848
- name: Build the server image
4949
run: make OS_NAME=${{ matrix.os}} BUILD_ARCH=${{ matrix.arch}} build-server
5050
- name: Upload server image
51-
uses: ishworkh/docker-image-artifact-upload@v1
51+
uses: ishworkh/container-image-artifact-upload@v1.0.0
5252
with:
5353
image: "samba-server:${{ matrix.os }}-latest"
54+
container_engine: ${{ env.CONTAINER_CMD }}
5455
retention_days: 1
5556

5657
build-ad-server:
@@ -68,9 +69,10 @@ jobs:
6869
- name: Build the ad server image
6970
run: make OS_NAME=${{matrix.os}} BUILD_ARCH=${{matrix.arch}} build-ad-server
7071
- name: Upload ad server image
71-
uses: ishworkh/docker-image-artifact-upload@v1
72+
uses: ishworkh/container-image-artifact-upload@v1.0.0
7273
with:
7374
image: "samba-ad-server:${{ matrix.os}}-latest"
75+
container_engine: ${{ env.CONTAINER_CMD }}
7476
retention_days: 1
7577

7678
build-client:
@@ -88,9 +90,10 @@ jobs:
8890
# Here we upload samba-client image to artifacts locally for consumption
8991
# during the samba-toolbox build process.
9092
- name: Upload the client image
91-
uses: ishworkh/docker-image-artifact-upload@v1
93+
uses: ishworkh/container-image-artifact-upload@v1.0.0
9294
with:
9395
image: "quay.io/samba.org/samba-client:${{ matrix.os }}-latest"
96+
container_engine: ${{ env.CONTAINER_CMD }}
9497
retention_days: 1
9598

9699
build-toolbox:
@@ -107,9 +110,10 @@ jobs:
107110
# Download locally stored samba-client image to be used as base for building
108111
# samba-toolbox.
109112
- name: Download client image
110-
uses: ishworkh/docker-image-artifact-download@v1
113+
uses: ishworkh/container-image-artifact-download@v1.0.0
111114
with:
112115
image: "quay.io/samba.org/samba-client:${{ matrix.os }}-latest"
116+
container_engine: ${{ env.CONTAINER_CMD }}
113117
- name: Build the toolbox image
114118
run: make OS_NAME=${{ matrix.os }} BUILD_ARCH=${{ matrix.arch }} build-toolbox
115119

@@ -123,9 +127,10 @@ jobs:
123127
steps:
124128
- uses: actions/checkout@v3
125129
- name: Download server image
126-
uses: ishworkh/docker-image-artifact-download@v1
130+
uses: ishworkh/container-image-artifact-download@v1.0.0
127131
with:
128132
image: "samba-server:${{ matrix.os }}-latest"
133+
container_engine: ${{ env.CONTAINER_CMD }}
129134
- name: Test the server image
130135
run: LOCAL_TAG="samba-server:${{ matrix.os}}-latest" tests/test-samba-container.sh
131136

@@ -144,9 +149,10 @@ jobs:
144149
- name: Build the nightly server image
145150
run: make OS_NAME=${{ matrix.os }} BUILD_ARCH=${{ matrix.arch }} build-nightly-server
146151
- name: Upload nightly server image
147-
uses: ishworkh/docker-image-artifact-upload@v1
152+
uses: ishworkh/container-image-artifact-upload@v1.0.0
148153
with:
149154
image: "samba-server:${{ matrix.os }}-nightly"
155+
container_engine: ${{ env.CONTAINER_CMD }}
150156
retention_days: 1
151157

152158
build-nightly-ad-server:
@@ -164,9 +170,10 @@ jobs:
164170
- name: Build the nightly ad server image
165171
run: make OS_NAME=${{ matrix.os }} BUILD_ARCH=${{ matrix.arch }} build-nightly-ad-server
166172
- name: Upload nightly AD server image
167-
uses: ishworkh/docker-image-artifact-upload@v1
173+
uses: ishworkh/container-image-artifact-upload@v1.0.0
168174
with:
169175
image: "samba-ad-server:${{ matrix.os }}-nightly"
176+
container_engine: ${{ env.CONTAINER_CMD }}
170177
retention_days: 1
171178

172179
test-nightly-server:
@@ -179,9 +186,10 @@ jobs:
179186
steps:
180187
- uses: actions/checkout@v3
181188
- name: Download nightly server image
182-
uses: ishworkh/docker-image-artifact-download@v1
189+
uses: ishworkh/container-image-artifact-download@v1.0.0
183190
with:
184191
image: "samba-server:${{ matrix.os }}-nightly"
192+
container_engine: ${{ env.CONTAINER_CMD }}
185193
- name: Test the nightly server image
186194
run: LOCAL_TAG=samba-server:${{ matrix.os }}-nightly tests/test-samba-container.sh
187195

@@ -205,15 +213,17 @@ jobs:
205213
- name: get nodes
206214
run: kubectl get nodes
207215
- name: Download ad server image
208-
uses: ishworkh/docker-image-artifact-download@v1
216+
uses: ishworkh/container-image-artifact-download@v1.0.0
209217
with:
210218
image: "samba-ad-server:${{ matrix.os }}-latest"
219+
container_engine: ${{ env.CONTAINER_CMD }}
211220
- name: import ad server image
212221
run: k3d image import samba-ad-server:${{ matrix.os }}-latest
213222
- name: Download file server image
214-
uses: ishworkh/docker-image-artifact-download@v1
223+
uses: ishworkh/container-image-artifact-download@v1.0.0
215224
with:
216225
image: "samba-server:${{ matrix.os }}-latest"
226+
container_engine: ${{ env.CONTAINER_CMD }}
217227
- name: import file server image
218228
run: k3d image import samba-server:${{ matrix.os }}-latest
219229
- name: run the ad-dc deployment test
@@ -239,15 +249,17 @@ jobs:
239249
- name: get nodes
240250
run: kubectl get nodes
241251
- name: Download nightly ad server image
242-
uses: ishworkh/docker-image-artifact-download@v1
252+
uses: ishworkh/container-image-artifact-download@v1.0.0
243253
with:
244254
image: "samba-ad-server:${{ matrix.os }}-nightly"
255+
container_engine: ${{ env.CONTAINER_CMD }}
245256
- name: import nightly ad server image
246257
run: k3d image import samba-ad-server:${{ matrix.os }}-nightly
247258
- name: Download nightly file server image
248-
uses: ishworkh/docker-image-artifact-download@v1
259+
uses: ishworkh/container-image-artifact-download@v1.0.0
249260
with:
250261
image: "samba-server:${{ matrix.os }}-nightly"
262+
container_engine: ${{ env.CONTAINER_CMD }}
251263
- name: import nightly file server image
252264
run: k3d image import samba-server:${{ matrix.os }}-nightly
253265
- name: run the ad-dc deployment test

0 commit comments

Comments
 (0)