Skip to content

Commit bbac08f

Browse files
elezarelezar
authored
Merge pull request #5 from elezar/update-images
Update images
2 parents 5196dea + caebe55 commit bbac08f

File tree

6 files changed

+36
-120
lines changed

6 files changed

+36
-120
lines changed

‎.common-ci.yml

+8-30
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,13 @@ stages:
3939
- release
4040

4141
# Define the distribution targets
42-
.dist-ubuntu18.04:
42+
.dist-ubuntu22.04:
4343
variables:
44-
DIST: ubuntu18.04
45-
CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
46-
47-
.dist-ubuntu20.04:
48-
variables:
49-
DIST: ubuntu20.04
50-
CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
44+
DIST: ubuntu22.04
5145

5246
.dist-ubi8:
5347
variables:
5448
DIST: ubi8
55-
CVE_UPDATES: "cyrus-sasl-lib"
5649

5750
# Define the platform targets
5851
.platform-amd64:
@@ -169,34 +162,19 @@ release:staging-vectoradd-ubi8:
169162
needs:
170163
- image-vectoradd-ubi8
171164

172-
release:staging-vectoradd-ubuntu18.04:
173-
extends:
174-
- .release:staging
175-
- .dist-ubuntu18.04
176-
- .sample-vectoradd
177-
needs:
178-
- image-vectoradd-ubuntu18.04
179-
180-
release:staging-vectoradd-ubuntu20.04:
165+
release:staging-vectoradd-ubuntu22.04:
181166
extends:
182167
- .release:staging
183-
- .dist-ubuntu20.04
168+
- .dist-ubuntu22.04
184169
- .sample-vectoradd
185170
needs:
186-
- image-vectoradd-ubuntu20.04
171+
- image-vectoradd-ubuntu22.04
187172

188-
release:staging-device-query-ubuntu20.04:
173+
release:staging-device-query-ubuntu22.04:
189174
extends:
190175
- .release:staging
191-
- .dist-ubuntu20.04
176+
- .dist-ubuntu22.04
192177
- .sample-device-query
193178
needs:
194-
- image-device-query-ubuntu20.04
179+
- image-device-query-ubuntu22.04
195180

196-
release:staging-nbody-ubuntu18.04:
197-
extends:
198-
- .release:staging
199-
- .dist-ubuntu18.04
200-
- .sample-nbody
201-
needs:
202-
- image-nbody-ubuntu18.04

‎.github/workflows/image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
matrix:
3636
dist:
37-
- ubuntu18.04
37+
- ubuntu22.04
3838
- ubi8
3939
sample:
4040
- vectorAdd

‎.nvidia-ci.yml

+22-84
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,10 @@ variables:
6666
- regctl registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}"
6767
- make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${OUT_VERSION}-${DIST} push-${DIST}
6868

69-
image-vectoradd-ubuntu18.04:
69+
image-vectoradd-ubuntu22.04:
7070
extends:
7171
- .image-pull
72-
- .dist-ubuntu18.04
73-
- .sample-vectoradd
74-
75-
image-vectoradd-ubuntu20.04:
76-
extends:
77-
- .image-pull
78-
- .dist-ubuntu20.04
72+
- .dist-ubuntu22.04
7973
- .sample-vectoradd
8074

8175
image-vectoradd-ubi8:
@@ -84,18 +78,12 @@ image-vectoradd-ubi8:
8478
- .dist-ubi8
8579
- .sample-vectoradd
8680

87-
image-device-query-ubuntu20.04:
81+
image-device-query-ubuntu22.04:
8882
extends:
8983
- .image-pull
90-
- .dist-ubuntu20.04
84+
- .dist-ubuntu22.04
9185
- .sample-device-query
9286

93-
image-nbody-ubuntu18.04:
94-
extends:
95-
- .image-pull
96-
- .dist-ubuntu18.04
97-
- .sample-nbody
98-
9987
# The .scan step forms the base of the image scan operation performed before releasing
10088
# images.
10189
.scan:
@@ -128,62 +116,43 @@ image-nbody-ubuntu18.04:
128116
- policy_evaluation.json
129117

130118
# Define the scan targets
131-
scan-vectoradd-ubuntu18.04-amd64:
132-
extends:
133-
- .scan
134-
- .sample-vectoradd
135-
- .dist-ubuntu18.04
136-
- .platform-amd64
137-
needs:
138-
- image-vectoradd-ubuntu18.04
139-
140-
scan-vectoradd-ubuntu18.04-arm64:
141-
extends:
142-
- .scan
143-
- .sample-vectoradd
144-
- .dist-ubuntu18.04
145-
- .platform-arm64
146-
needs:
147-
- image-vectoradd-ubuntu18.04
148-
- scan-vectoradd-ubuntu18.04-amd64
149-
150-
scan-vectoradd-ubuntu20.04-amd64:
119+
scan-vectoradd-ubuntu22.04-amd64:
151120
extends:
152121
- .scan
153122
- .sample-vectoradd
154-
- .dist-ubuntu20.04
123+
- .dist-ubuntu22.04
155124
- .platform-amd64
156125
needs:
157-
- image-vectoradd-ubuntu20.04
126+
- image-vectoradd-ubuntu22.04
158127

159-
scan-vectoradd-ubuntu20.04-arm64:
128+
scan-vectoradd-ubuntu22.04-arm64:
160129
extends:
161130
- .scan
162131
- .sample-vectoradd
163-
- .dist-ubuntu20.04
132+
- .dist-ubuntu22.04
164133
- .platform-arm64
165134
needs:
166-
- image-vectoradd-ubuntu20.04
167-
- scan-vectoradd-ubuntu20.04-amd64
135+
- image-vectoradd-ubuntu22.04
136+
- scan-vectoradd-ubuntu22.04-amd64
168137

169-
scan-device-query-ubuntu20.04-amd64:
138+
scan-device-query-ubuntu22.04-amd64:
170139
extends:
171140
- .scan
172141
- .sample-device-query
173-
- .dist-ubuntu20.04
142+
- .dist-ubuntu22.04
174143
- .platform-amd64
175144
needs:
176-
- image-device-query-ubuntu20.04
145+
- image-device-query-ubuntu22.04
177146

178-
scan-device-query-ubuntu20.04-arm64:
147+
scan-device-query-ubuntu22.04-arm64:
179148
extends:
180149
- .scan
181150
- .sample-device-query
182-
- .dist-ubuntu20.04
151+
- .dist-ubuntu22.04
183152
- .platform-arm64
184153
needs:
185-
- image-device-query-ubuntu20.04
186-
- scan-device-query-ubuntu20.04-amd64
154+
- image-device-query-ubuntu22.04
155+
- scan-device-query-ubuntu22.04-amd64
187156

188157
scan-vectoradd-ubi8-amd64:
189158
extends:
@@ -204,25 +173,6 @@ scan-vectoradd-ubi8-arm64:
204173
- image-vectoradd-ubi8
205174
- scan-vectoradd-ubi8-amd64
206175

207-
scan-nbody-ubuntu18.04-amd64:
208-
extends:
209-
- .scan
210-
- .sample-nbody
211-
- .dist-ubuntu18.04
212-
- .platform-amd64
213-
needs:
214-
- image-nbody-ubuntu18.04
215-
216-
scan-nbody-ubuntu18.04-arm64:
217-
extends:
218-
- .scan
219-
- .sample-nbody
220-
- .dist-ubuntu18.04
221-
- .platform-arm64
222-
needs:
223-
- image-nbody-ubuntu18.04
224-
- scan-nbody-ubuntu18.04-amd64
225-
226176
# Define external release helpers
227177
.release:ngc:
228178
extends:
@@ -235,32 +185,20 @@ scan-nbody-ubuntu18.04-arm64:
235185

236186
# Define the external release targets
237187
# Release to NGC
238-
release:ngc-vectoradd-ubuntu18.04:
188+
release:ngc-vectoradd-ubuntu22.04:
239189
extends:
240190
- .release:ngc
241-
- .dist-ubuntu18.04
191+
- .dist-ubuntu22.04
242192
- .sample-vectoradd
243193

244-
release:ngc-vectoradd-ubuntu20.04:
194+
release:ngc-device-query-ubuntu22.04:
245195
extends:
246196
- .release:ngc
247-
- .dist-ubuntu20.04
248-
- .sample-vectoradd
249-
250-
release:ngc-device-query-ubuntu20.04:
251-
extends:
252-
- .release:ngc
253-
- .dist-ubuntu20.04
197+
- .dist-ubuntu22.04
254198
- .sample-device-query
255199

256200
release:ngc-vectoradd-ubi8:
257201
extends:
258202
- .release:ngc
259203
- .dist-ubi8
260204
- .sample-vectoradd
261-
262-
release:ngc-nbody-ubuntu18.04:
263-
extends:
264-
- .release:ngc
265-
- .dist-ubuntu18.04
266-
- .sample-nbody

‎deployments/container/Dockerfile.ubuntu

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM nvidia/cuda:12.5.0-devel-ubuntu20.04 AS builder
15+
FROM nvidia/cuda:12.5.0-devel-ubuntu22.04 AS builder
1616

1717
ARG SAMPLE_NAME
1818
ENV SAMPLE_NAME ${SAMPLE_NAME}
@@ -41,7 +41,7 @@ RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${C
4141
make build && \
4242
cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME}
4343

44-
FROM nvidia/cuda:12.5.0-base-ubuntu20.04
44+
FROM nvidia/cuda:12.5.0-base-ubuntu22.04
4545
ARG SAMPLE_NAME
4646
LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
4747
LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"

‎deployments/container/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ OUT_IMAGE_VERSION ?= $(VERSION)
4444
OUT_IMAGE_TAG ?= $(LOWER_CASE_SAMPLE)-$(OUT_IMAGE_VERSION)-$(DIST)
4545
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
4646

47-
DEFAULT_PUSH_TARGET := ubuntu18.04
48-
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubi8
47+
DEFAULT_PUSH_TARGET := ubuntu22.04
48+
DISTRIBUTIONS := ubuntu22.04 ubi8
4949

5050
BUILD_TARGETS := $(patsubst %,build-%, $(DISTRIBUTIONS))
5151
PUSH_TARGETS := $(patsubst %,push-%, $(DISTRIBUTIONS))

‎versions.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ VERSION ?= cuda$(shell grep -Eo "FROM.*cuda:[0-9\.]+" deployments/container/Doc
1717

1818
# Specify the tag for the https://github.com/NVIDIA/cuda-samples repository.
1919
# This need not match the CUDA_VERSION above.
20-
CUDA_SAMPLES_VERSION := v11.6
20+
CUDA_SAMPLES_VERSION := v12.0

0 commit comments

Comments
 (0)