From 79510a829007f028174fde2843e44109c2218bad Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Jun 2022 10:35:48 +0200 Subject: [PATCH 1/5] Bump CUDA base image version to 11.7.0 Signed-off-by: Evan Lezar --- versions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.mk b/versions.mk index 3af4c12d..8672062a 100644 --- a/versions.mk +++ b/versions.mk @@ -24,7 +24,7 @@ NVIDIA_CONTAINER_RUNTIME_VERSION := 3.10.0 # Specify the expected libnvidia-container0 version for arm64-based ubuntu builds. LIBNVIDIA_CONTAINER0_VERSION := 0.10.0+jetpack -CUDA_VERSION := 11.6.0 +CUDA_VERSION := 11.7.0 GOLANG_VERSION := 1.17.8 GIT_COMMIT ?= $(shell git describe --dirty --long --always 2> /dev/null || echo "") From 068d7e085b3cbc0078afb67315852f6a2100cd24 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Jun 2022 10:39:53 +0200 Subject: [PATCH 2/5] Use ubi8 base image for centos8 Signed-off-by: Evan Lezar --- build/container/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build/container/Makefile b/build/container/Makefile index 7a1186e7..3b523954 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -110,10 +110,15 @@ build-ubi8: DOCKERFILE_SUFFIX := centos build-ubi8: PACKAGE_DIST = centos8 build-ubi8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) -build-centos%: BASE_DIST = $(*) -build-centos%: DOCKERFILE_SUFFIX := centos -build-centos%: PACKAGE_DIST = $(BASE_DIST) -build-centos%: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) +build-centos7: BASE_DIST = $(*) +build-centos7: DOCKERFILE_SUFFIX := centos +build-centos7: PACKAGE_DIST = $(BASE_DIST) +build-centos7: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) + +build-centos8: BASE_DIST := ubi8 +build-centos8: DOCKERFILE_SUFFIX := centos +build-centos8: PACKAGE_DIST = centos8 +build-centos8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) build-packaging: BASE_DIST := ubuntu20.04 build-packaging: DOCKERFILE_SUFFIX := packaging From 9146b4d4b6e500c5d7106a0a280b9108d1f8cfb6 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Jun 2022 10:43:32 +0200 Subject: [PATCH 3/5] Remove build and release of centos8 container-toolkit images Note that the centos8 packages are still built. Signed-off-by: Evan Lezar --- .common-ci.yml | 7 ------- .gitlab-ci.yml | 10 ---------- .nvidia-ci.yml | 27 --------------------------- build/container/Makefile | 7 +------ 4 files changed, 1 insertion(+), 50 deletions(-) diff --git a/.common-ci.yml b/.common-ci.yml index 93c575ce..e9ab8ef5 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -210,13 +210,6 @@ release:staging-centos7: needs: - image-centos7 -release:staging-centos8: - extends: - - .release:staging - - .dist-centos8 - needs: - - image-centos8 - release:staging-ubi8: extends: - .release:staging diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9716b97d..919d6588 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -231,16 +231,6 @@ image-centos7: - package-centos7-ppc64le - package-centos7-x86_64 -image-centos8: - extends: - - .image-build - - .package-artifacts - - .dist-centos8 - needs: - - package-centos8-aarch64 - - package-centos8-x86_64 - - package-centos8-ppc64le - image-ubi8: extends: - .image-build diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 3f778cdf..55f9ad4e 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -70,11 +70,6 @@ image-centos7: - .image-pull - .dist-centos7 -image-centos8: - extends: - - .image-pull - - .dist-centos8 - image-ubi8: extends: - .image-pull @@ -154,23 +149,6 @@ scan-centos7-arm64: - image-centos7 - scan-centos7-amd64 -scan-centos8-amd64: - extends: - - .scan - - .dist-centos8 - - .platform-amd64 - needs: - - image-centos8 - -scan-centos8-arm64: - extends: - - .scan - - .dist-centos8 - - .platform-arm64 - needs: - - image-centos8 - - scan-centos8-amd64 - scan-ubuntu18.04-amd64: extends: - .scan @@ -253,11 +231,6 @@ release:ngc-centos7: - .release:ngc - .dist-centos7 -release:ngc-centos8: - extends: - - .release:ngc - - .dist-centos8 - release:ngc-ubuntu18.04: extends: - .release:ngc diff --git a/build/container/Makefile b/build/container/Makefile index 3b523954..db0955e4 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -44,7 +44,7 @@ OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) ##### Public rules ##### DEFAULT_PUSH_TARGET := ubuntu18.04 -DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 centos8 +DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 META_TARGETS := packaging @@ -115,11 +115,6 @@ build-centos7: DOCKERFILE_SUFFIX := centos build-centos7: PACKAGE_DIST = $(BASE_DIST) build-centos7: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) -build-centos8: BASE_DIST := ubi8 -build-centos8: DOCKERFILE_SUFFIX := centos -build-centos8: PACKAGE_DIST = centos8 -build-centos8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) - build-packaging: BASE_DIST := ubuntu20.04 build-packaging: DOCKERFILE_SUFFIX := packaging build-packaging: PACKAGE_ARCH := amd64 From df391e2144807d1734a7c39e545e4a36d08a6bc4 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Fri, 3 Jun 2022 20:34:36 +0200 Subject: [PATCH 4/5] Only generate amd64 images for ubuntu18.04 Signed-off-by: Evan Lezar --- .nvidia-ci.yml | 9 --------- build/container/multi-arch.mk | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 55f9ad4e..d75b0e1e 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -157,15 +157,6 @@ scan-ubuntu18.04-amd64: needs: - image-ubuntu18.04 -scan-ubuntu18.04-arm64: - extends: - - .scan - - .dist-ubuntu18.04 - - .platform-arm64 - needs: - - image-ubuntu18.04 - - scan-ubuntu18.04-amd64 - scan-ubuntu20.04-amd64: extends: - .scan diff --git a/build/container/multi-arch.mk b/build/container/multi-arch.mk index 94a3527c..445ea0d0 100644 --- a/build/container/multi-arch.mk +++ b/build/container/multi-arch.mk @@ -30,5 +30,8 @@ push-short: # We only have x86_64 packages for centos7 build-centos7: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64 +# We only generate amd64 image for ubuntu18.04 +build-ubuntu18.04: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64 + # We only generate a single image for packaging targets build-packaging: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64 From e033db559fc5ed4cbff4d12306b346efe011c614 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 7 Jun 2022 11:32:20 +0200 Subject: [PATCH 5/5] Switch default container-toolkit image target to ubuntu20.04 Signed-off-by: Evan Lezar --- build/container/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/container/Makefile b/build/container/Makefile index db0955e4..d69b1b69 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -43,7 +43,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST) OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) ##### Public rules ##### -DEFAULT_PUSH_TARGET := ubuntu18.04 +DEFAULT_PUSH_TARGET := ubuntu20.04 DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 META_TARGETS := packaging