diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux index 01f738cd..cd1e2c86 100644 --- a/docker/Dockerfile.amazonlinux +++ b/docker/Dockerfile.amazonlinux @@ -65,6 +65,7 @@ CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ -D "release_date $(date +'%a %b %d %Y')" \ + -D "git_commit ${GIT_COMMIT}" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index 3cf6b5ec..0c8befe2 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -63,6 +63,7 @@ CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ -D "release_date $(date +'%a %b %d %Y')" \ + -D "git_commit ${GIT_COMMIT}" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index e0d64ec6..2fbbda2d 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -67,7 +67,7 @@ COPY packaging/debian ./debian RUN dch --create --package="${PKG_NAME}" \ --newversion "${REVISION}" \ - "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md for the changelog" && \ + "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/${GIT_COMMIT}/CHANGELOG.md for the changelog" && \ dch --append "Bump libnvidia-container dependency to ${REVISION}" && \ dch -r "" && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index 11386628..d00a9714 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -61,6 +61,7 @@ CMD arch=$(uname -m) && \ rpmbuild --clean --target=$arch -bb \ -D "_topdir $PWD" \ -D "release_date $(date +'%a %b %d %Y')" \ + -D "git_commit ${GIT_COMMIT}" \ -D "version $VERSION" \ -D "libnvidia_container_version ${VERSION}-${RELEASE}" \ -D "release $RELEASE" \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index a5e152f0..53845d2c 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -60,7 +60,7 @@ COPY packaging/debian ./debian RUN dch --create --package="${PKG_NAME}" \ --newversion "${REVISION}" \ - "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md for the changelog" && \ + "See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/${GIT_COMMIT}/CHANGELOG.md for the changelog" && \ dch --append "Bump libnvidia-container dependency to ${REVISION}" && \ dch -r "" && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index d5a1b4f2..e2f68fb1 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -69,5 +69,5 @@ rm -f %{_bindir}/nvidia-container-runtime-hook %changelog # As of 1.10.0-1 we generate the release information automatically * %{release_date} NVIDIA CORPORATION %{version}-%{release} -- See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/main/CHANGELOG.md +- See https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/%{git_commit}/CHANGELOG.md - Bump libnvidia-container dependency to libnvidia-container-tools >= %{libnvidia_container_version}