From a0d2b22a54890078a9a974ea07788cda18624dac Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 1 Feb 2022 14:14:33 +0100 Subject: [PATCH] Enable multi-arch builds This change adds arm64/aarch64 images to supported distributions. This is triggered if BUILD_MULTI_ARCH_IMAGE=true. Note that for ubi8 images this means that we switch to using centos8 packages instead of centos7 since we do not build aarch64 packages for the latter. This also means that for centos7 we only build x86_64 images. Signed-off-by: Evan Lezar --- .gitlab-ci.yml | 7 +++--- build/container/Makefile | 39 +++++++++++++--------------------- build/container/multi-arch.mk | 34 +++++++++++++++++++++++++++++ build/container/native-only.mk | 22 +++++++++++++++++++ 4 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 build/container/multi-arch.mk create mode 100644 build/container/native-only.mk diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4dc22b62..779824a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -233,9 +233,10 @@ image-ubi8: - .package-artifacts - .dist-ubi8 needs: - # Note: The ubi8 image currently uses the centos7 packages - - package-centos7-ppc64le - - package-centos7-x86_64 + # Note: The ubi8 image uses the centos8 packages + - package-centos8-aarch64 + - package-centos8-x86_64 + - package-centos8-ppc64le image-ubuntu18.04: extends: diff --git a/build/container/Makefile b/build/container/Makefile index a131ef55..2523a577 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -32,10 +32,16 @@ IMAGE_NAME := $(REGISTRY)/container-toolkit endif VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) +IMAGE_VERSION := $(VERSION) IMAGE_TAG ?= $(VERSION)-$(DIST) IMAGE = $(IMAGE_NAME):$(IMAGE_TAG) +OUT_IMAGE_NAME ?= $(IMAGE_NAME) +OUT_IMAGE_VERSION ?= $(IMAGE_VERSION) +OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST) +OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) + ##### Public rules ##### DEFAULT_PUSH_TARGET := ubuntu18.04 DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7 centos8 @@ -48,15 +54,11 @@ TEST_TARGETS := $(patsubst %,test-%, $(DISTRIBUTIONS)) .PHONY: $(DISTRIBUTIONS) $(PUSH_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS) -push-%: DIST = $(*) -ifeq ($(BUILD_MULTI_ARCH_IMAGES),true) -# For multi-arch images we use buildx and set push=true, invoking the build -# target directly -push-%: DOCKER_BUILD_OPTIONS = --output=type=image,push=true -$(PUSH_TARGETS): push-%: build-% +ifneq ($(BUILD_MULTI_ARCH_IMAGES),true) +include $(CURDIR)/build/container/native-only.mk else -$(PUSH_TARGETS): push-%: - $(DOCKER) push "$(IMAGE_NAME):$(IMAGE_TAG)" +include $(CURDIR)/build/container/multi-arch.mk +endif # For the default push target we also push a short tag equal to the version. # We skip this for the development release @@ -64,27 +66,19 @@ DEVEL_RELEASE_IMAGE_VERSION ?= devel ifneq ($(strip $(VERSION)),$(DEVEL_RELEASE_IMAGE_VERSION)) push-$(DEFAULT_PUSH_TARGET): push-short endif -push-short: - $(DOCKER) tag "$(IMAGE_NAME):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(IMAGE_NAME):$(VERSION)" - $(DOCKER) push "$(IMAGE_NAME):$(VERSION)" -endif + +push-%: DIST = $(*) +push-short: DIST = $(DEFAULT_PUSH_TARGET) build-%: DIST = $(*) build-%: DOCKERFILE = $(CURDIR)/build/container/Dockerfile.$(DOCKERFILE_SUFFIX) ARTIFACTS_ROOT ?= $(shell realpath --relative-to=$(CURDIR) $(DIST_DIR)) -# TODO: This should be distribution dependand -DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64 - -ifeq ($(BUILD_MULTI_ARCH_IMAGES),true) -DOCKER_BUILD_OPTIONS = --output=type=image,push=false -endif - # Use a generic build target to build the relevant images $(BUILD_TARGETS): build-%: $(ARTIFACTS_ROOT) DOCKER_BUILDKIT=1 \ - $(DOCKER) build --pull \ + $(DOCKER) $(BUILDX) build --pull \ $(DOCKER_BUILD_OPTIONS) \ $(DOCKER_BUILD_PLATFORM_OPTIONS) \ --tag $(IMAGE) \ @@ -107,10 +101,9 @@ build-ubuntu%: PACKAGE_DIST = ubuntu18.04 build-ubuntu%: PACKAGE_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),~$(LIB_TAG)) build-ubuntu%: LIBNVIDIA_CONTAINER0_DEPENDENCY=$(LIBNVIDIA_CONTAINER0_VERSION) -# TODO: Update this to use the centos8 packages build-ubi8: BASE_DIST := ubi8 build-ubi8: DOCKERFILE_SUFFIX := centos -build-ubi8: PACKAGE_DIST = centos7 +build-ubi8: PACKAGE_DIST = centos8 build-ubi8: PACKAGE_VERSION := $(LIB_VERSION)-$(if $(LIB_TAG),0.1.$(LIB_TAG),1) build-centos%: BASE_DIST = $(*) @@ -123,8 +116,6 @@ build-packaging: DOCKERFILE_SUFFIX := packaging build-packaging: PACKAGE_ARCH := amd64 build-packaging: PACKAGE_DIST = all build-packaging: PACKAGE_VERSION := $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) -# We only generate a single image for packaging targets -build-packaging: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64 # Test targets test-%: DIST = $(*) diff --git a/build/container/multi-arch.mk b/build/container/multi-arch.mk new file mode 100644 index 00000000..94a3527c --- /dev/null +++ b/build/container/multi-arch.mk @@ -0,0 +1,34 @@ +# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +PUSH_ON_BUILD ?= false +DOCKER_BUILD_OPTIONS = --output=type=image,push=$(PUSH_ON_BUILD) +DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64,linux/arm64 + +REGCTL ?= regctl +$(PUSH_TARGETS): push-%: + $(REGCTL) \ + image copy \ + $(IMAGE) $(OUT_IMAGE) + +push-short: + $(REGCTL) \ + image copy \ + $(IMAGE) $(OUT_IMAGE_NAME):$(OUT_IMAGE_VERSION) + +# We only have x86_64 packages for centos7 +build-centos7: 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 diff --git a/build/container/native-only.mk b/build/container/native-only.mk new file mode 100644 index 00000000..be508588 --- /dev/null +++ b/build/container/native-only.mk @@ -0,0 +1,22 @@ +# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64 + +$(PUSH_TARGETS): push-%: + $(DOCKER) push "$(IMAGE_NAME):$(IMAGE_TAG)" + +push-short: + $(DOCKER) tag "$(IMAGE_NAME):$(VERSION)-$(DEFAULT_PUSH_TARGET)" "$(IMAGE_NAME):$(VERSION)" + $(DOCKER) push "$(IMAGE_NAME):$(VERSION)"