소스 검색

Add an additional common boilerplate to the "License" section of all images

Tianon Gravi 8 년 전
부모
커밋
0b2bd17007
2개의 변경된 파일7개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 0
      .template-helpers/license-common.md
  2. 2 1
      update.sh

+ 5 - 0
.template-helpers/license-common.md

@@ -0,0 +1,5 @@
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+Some additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `%%REPO%%/` directory](https://github.com/docker-library/repo-info/tree/master/repos/%%REPO%%).
+
+As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.

+ 2 - 1
update.sh

@@ -44,8 +44,9 @@ for image in "${images[@]}"; do
 		getHelp="$(cat "$repo/get-help.md" 2>/dev/null || cat "$helperDir/get-help.md")"
 
 		license="$(cat "$repo/license.md" 2>/dev/null || true)"
+		licenseCommon="$(cat "$repo/license-common.md" 2>/dev/null || cat "$helperDir/license-common.md")"
 		if [ "$license" ]; then
-			license=$'\n\n''# License'$'\n\n'"$license"
+			license=$'\n\n''# License'$'\n\n'"$license"$'\n\n'"$licenseCommon"
 		fi
 
 		logo=