Skip to content
This repository has been archived by the owner on Jan 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'add-fedora35' into 'main'
Browse files Browse the repository at this point in the history
Add fedora35 package targets

See merge request nvidia/container-toolkit/nvidia-docker!44
  • Loading branch information
Evan Lezar committed Aug 10, 2022
2 parents 0c082f6 + f860ddf commit 80902fe
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions docker/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -145,13 +145,23 @@ 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

# Specify required docker versions
--ubuntu%: DOCKER_VERSION := docker-ce (>= 18.06.0~ce~3-0~ubuntu) | docker-ee (>= 18.06.0~ce~3-0~ubuntu) | docker.io (>= 18.06.0) | moby-engine
--debian%: DOCKER_VERSION := docker-ce (>= 18.06.0~ce~3-0~debian) | docker-ee (>= 18.06.0~ce~3-0~debian) | docker.io (>= 18.06.0) | moby-engine
--centos%: DOCKER_VERSION := docker-ce >= 18.06.3.ce-3.el7
--amazonlinux2%: DOCKER_VERSION := docker >= 18.06.1ce-2.amzn2
--opensuse-leap%: DOCKER_VERSION := docker >= 18.09.1_ce
--rhel%: DOCKER_VERSION := docker-ce >= 18.06.3.ce-3.el7
--fedora%: DOCKER_VERSION := docker-ce

# Depending on the docker version we may have to add the platform args to the
# build and run commands
Expand All @@ -169,7 +179,7 @@ docker-build-%:
--build-arg BASEIMAGE="$(BASEIMAGE)" \
--build-arg DOCKER_VERSION="$(DOCKER_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) \
Expand Down

0 comments on commit 80902fe

Please sign in to comment.