瀏覽代碼

Merge pull request #1058 from infosiftr/license-common

Add an additional common boilerplate to the "License" section of all images
yosifkit 8 年之前
父節點
當前提交
4d1f49db69
共有 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=