From 629d575fad2464a511d750bda9b54408f504c220 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 25 Nov 2021 20:02:07 +0100 Subject: [PATCH] Add packaging target that includes all release packages Signed-off-by: Evan Lezar --- build/container/Dockerfile.packaging | 32 ++++++++++++++++++++++++++++ build/container/Makefile | 9 ++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 build/container/Dockerfile.packaging diff --git a/build/container/Dockerfile.packaging b/build/container/Dockerfile.packaging new file mode 100644 index 00000000..da1a4ce8 --- /dev/null +++ b/build/container/Dockerfile.packaging @@ -0,0 +1,32 @@ +# Copyright (c) 2021, 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. + +ARG BASE_DIST +ARG CUDA_VERSION +ARG GOLANG_VERSION=x.x.x +ARG VERSION="N/A" + +FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST} + +ENV NVIDIA_CONTAINER_TOOLKIT_VERSION="${VERSION}" + +ARG ARTIFACTS_DIR +COPY ${ARTIFACTS_DIR}/ /artifacts/packages/ + +WORKDIR /artifacts/packages + +COPY ./LICENSE /licenses/LICENSE + +# This container is not intended to be run +ENTRYPOINT ["exit", "1"] diff --git a/build/container/Makefile b/build/container/Makefile index 38c9064d..f37880bb 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -31,14 +31,15 @@ IMAGE = $(IMAGE_NAME):$(IMAGE_TAG) ##### Public rules ##### DEFAULT_PUSH_TARGET := ubuntu18.04 -TARGETS := ubuntu20.04 ubuntu18.04 ubi8 centos7 centos8 +TARGETS := ubuntu20.04 ubuntu18.04 ubi8 centos7 centos8 packaging BUILD_TARGETS := $(patsubst %, build-%, $(TARGETS)) PUSH_TARGETS := $(patsubst %, push-%, $(TARGETS)) -TEST_TARGETS := $(patsubst %, test-%, $(TARGETS)) +TEST_TARGETS := $(patsubst %, test-%, $(filter-out packaging,$(TARGETS))) .PHONY: $(TARGETS) $(PUSH_TARGETS) $(BUILD_TARGETS) $(TEST_TARGETS) +push-%: DIST = $(*) $(PUSH_TARGETS): push-%: $(DOCKER) push "$(IMAGE_NAME):$(IMAGE_TAG)" @@ -97,6 +98,10 @@ build-centos%: PACKAGE_ARCH := x86_64 build-centos7: BASE_DIST := centos7 build-centos8: BASE_DIST := centos8 +build-packaging: BASE_DIST := ubuntu20.04 +build-packaging: DOCKERFILE_SUFFIX := packaging +build-packaging: ARTIFACTS_DIR = $(ARTIFACTS_ROOT) + # Test targets test-%: DIST = $(*)