瀏覽代碼

Merge pull request #2051 from infosiftr/windows-exception

Officially exempt "microsoft/windowsservercore" and "microsoft/nanoserver" from the "non-official images" exclusion
yosifkit 9 年之前
父節點
當前提交
23b39eb6b7
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      README.md

+ 5 - 1
README.md

@@ -50,7 +50,11 @@ When taking over an existing repository, please ensure that the entire Git histo
 
 Rebuilding the same `Dockerfile` should result in the same version of the image being packaged, even if the second build happens several versions later, or the build should fail outright, such that an inadvertent rebuild of a `Dockerfile` tagged as `0.1.0` doesn't end up containing `0.2.3`. For example, if using `apt` to install the main program for the image, be sure to pin it to a specific version (ex: `... apt-get install -y my-package=0.1.0 ...`). For dependent packages installed by `apt` there is not usually a need to pin them to a version.
 
-No official images can be derived from, or depend on, non-official images.
+No official images can be derived from, or depend on, non-official images with the following notable exceptions:
+
+-	[`FROM scratch`](https://hub.docker.com/_/scratch/)
+-	[`FROM microsoft/windowsservercore`](https://hub.docker.com/r/microsoft/windowsservercore/)
+-	[`FROM microsoft/nanoserver`](https://hub.docker.com/r/microsoft/nanoserver/)
 
 #### Consistency