From 9c734386822b4723b33c6b59b66d1a47f25e49dc Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 31 Jan 2023 16:27:33 +0100 Subject: [PATCH 1/3] Add additional build args to manifest Signed-off-by: Evan Lezar --- build/container/Dockerfile.packaging | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/container/Dockerfile.packaging b/build/container/Dockerfile.packaging index d788b7d7..f8975ded 100644 --- a/build/container/Dockerfile.packaging +++ b/build/container/Dockerfile.packaging @@ -18,19 +18,22 @@ ARG GOLANG_VERSION=x.x.x FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST} -ARG VERSION="N/A" - ARG ARTIFACTS_ROOT COPY ${ARTIFACTS_ROOT} /artifacts/packages/ WORKDIR /artifacts/packages +# build-args are added to the manifest.txt file below. +ARG BASE_DIST +ARG PACKAGE_DIST +ARG PACKAGE_VERSION ARG GIT_BRANCH ARG GIT_COMMIT ARG SOURCE_DATE_EPOCH +ARG VERSION # Create a manifest.txt file with the absolute paths of all deb and rpm packages in the container -RUN echo "IMAGE_EPOCH=$(date '+%s')" | sed 's/^/#/g' > /artifacts/manifest.txt && \ +RUN echo "#IMAGE_EPOCH=$(date '+%s')" > /artifacts/manifest.txt && \ env | sed 's/^/#/g' >> /artifacts/manifest.txt && \ find /artifacts/packages -iname '*.deb' -o -iname '*.rpm' >> /artifacts/manifest.txt From ba5c4b28317f60c6fb5de885bec366da63e2fb79 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 31 Jan 2023 16:28:05 +0100 Subject: [PATCH 2/3] Use package version as version Signed-off-by: Evan Lezar --- scripts/release-kitmaker-artifactory.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh index 1566383a..83963eef 100755 --- a/scripts/release-kitmaker-artifactory.sh +++ b/scripts/release-kitmaker-artifactory.sh @@ -77,7 +77,7 @@ function extract_info() { IMAGE_EPOCH=$(extract_info "IMAGE_EPOCH") GIT_BRANCH=$(extract_info "GIT_BRANCH") GIT_COMMIT=$(extract_info "GIT_COMMIT") -VERSION=$(extract_info "VERSION") +VERSION=$(extract_info "PACKAGE_VERSION") # add_distro adds the specified component, os, and arch to the .package folder from which a kitmaker archive is generated. From f0c74910299174ac5e218b1fc72c0f740e1f60c7 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 1 Feb 2023 04:54:52 +0100 Subject: [PATCH 3/3] Use 'main' as branch component in kitmaker archive Signed-off-by: Evan Lezar --- scripts/release-kitmaker-artifactory.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh index 83963eef..6807f28a 100755 --- a/scripts/release-kitmaker-artifactory.sh +++ b/scripts/release-kitmaker-artifactory.sh @@ -75,7 +75,8 @@ function extract_info() { } IMAGE_EPOCH=$(extract_info "IMAGE_EPOCH") -GIT_BRANCH=$(extract_info "GIT_BRANCH") +# Note we use the main branch for the kitmaker archive. +GIT_BRANCH=main GIT_COMMIT=$(extract_info "GIT_COMMIT") VERSION=$(extract_info "PACKAGE_VERSION")