Merge branch 'update_container_licenses' into 'main'

shivamerla · shivamerla · commit 2ab0c6abce9d · 2022-06-08T19:04:22.000Z
Update toolkit images to use NGC DL license

See merge request nvidia/container-toolkit/container-toolkit!164
diff --git a/build/container/Dockerfile.centos b/build/container/Dockerfile.centos
@@ -85,7 +85,7 @@ LABEL release="N/A"
 LABEL summary="Automatically Configure your Container Runtime for GPU support."
 LABEL description="See summary"
 
-COPY ./LICENSE /licenses/LICENSE
+RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
 
 # Install / upgrade packages here that are required to resolve CVEs
 ARG CVE_UPDATES
diff --git a/build/container/Dockerfile.packaging b/build/container/Dockerfile.packaging
@@ -26,4 +26,4 @@ COPY ${ARTIFACTS_ROOT} /artifacts/packages/
 
 WORKDIR /artifacts/packages
 
-COPY ./LICENSE /licenses/LICENSE
+RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
diff --git a/build/container/Dockerfile.ubuntu b/build/container/Dockerfile.ubuntu
@@ -93,7 +93,7 @@ LABEL release="N/A"
 LABEL summary="Automatically Configure your Container Runtime for GPU support."
 LABEL description="See summary"
 
-COPY ./LICENSE /licenses/LICENSE
+RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE
 
 # Install / upgrade packages here that are required to resolve CVEs
 ARG CVE_UPDATES

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ COPY ${ARTIFACTS_ROOT} /artifacts/packages/`
`26`	`26`
`27`	`27`	`WORKDIR /artifacts/packages`
`28`	`28`
`29`		`-COPY ./LICENSE /licenses/LICENSE`
	`29`	`+RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-LICENSE`