Merge branch 'add-fedora35' into 'main'

Add fedora35 package targets

See merge request nvidia/container-toolkit/container-runtime!77

Author: Evan Lezar

docker/docker.mk

@@ -18,10 +18,10 @@ DIST_DIR ?= $(CURDIR)/dist
 
 # Supported OSs by architecture
 AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
-X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1
+X86_64_TARGETS := fedora35 centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1
 PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8
 ARM64_TARGETS := ubuntu20.04 ubuntu18.04
-AARCH64_TARGETS := centos8 rhel8 amazonlinux2
+AARCH64_TARGETS := fedora35 centos8 rhel8 amazonlinux2
 
 # By default run all native docker-based targets
 docker-native:
@@ -145,6 +145,15 @@ RPM_TOOLKIT_REV = $(if $(TOOLKIT_TAG),0.1.$(TOOLKIT_TAG),1)
 --rhel%: ARTIFACTS_DIR = $(DIST_DIR)/rhel$(VERSION)/$(ARCH)
 --rhel8%: BASEIMAGE = quay.io/centos/centos:stream8
 
+# private fedora target (actually built on centos)
+--fedora%: OS := centos
+--fedora%: PKG_VERS = $(LIB_VERSION)
+--fedora%: PKG_REV = $(RPM_PKG_REV)
+--fedora%: MIN_TOOLKIT_PKG_VERSION = $(RPM_TOOLKIT_VERSION)-$(RPM_TOOLKIT_REV)
+--fedora%: VERSION = $(patsubst fedora%-$(ARCH),%,$(TARGET_PLATFORM))
+--fedora%: ARTIFACTS_DIR = $(DIST_DIR)/fedora$(VERSION)/$(ARCH)
+--fedora%: BASEIMAGE = quay.io/centos/centos:stream8
+
 PLATFORM_ARGS ?= --platform=linux/$(ARCH)
 ifneq ($(strip $(ADD_DOCKER_PLATFORM_ARGS)),)
 DOCKER_PLATFORM_ARGS = $(PLATFORM_ARGS)
@@ -159,7 +168,7 @@ docker-build-%:
 	    --build-arg BASEIMAGE="$(BASEIMAGE)" \
 	    --build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 	    --build-arg TOOLKIT_VERSION="$(MIN_TOOLKIT_PKG_VERSION)" \
-		--build-arg PKG_NAME="$(LIB_NAME)" \
+	    --build-arg PKG_NAME="$(LIB_NAME)" \
 	    --build-arg PKG_VERS="$(PKG_VERS)" \
 	    --build-arg PKG_REV="$(PKG_REV)" \
 	    --tag $(BUILDIMAGE) \