Merge pull request docker-library#1310 from infosiftr/variant-version

Add <version> to all variant sections so that they won't be confused as actual tags
nice2mitja · Sep 18, 2018 · d1884db · d1884db
2 parents 5d2c940 + ede38db
commit d1884db
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 15 deletions.
diff --git a/.template-helpers/variant-alpine.md b/.template-helpers/variant-alpine.md
@@ -1,4 +1,4 @@
-## `%%IMAGE%%:alpine`
+## `%%IMAGE%%:<version>-alpine`
 
 This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
 

diff --git a/.template-helpers/variant-onbuild.md b/.template-helpers/variant-onbuild.md
@@ -1,4 +1,4 @@
-## `%%IMAGE%%:onbuild`
+## `%%IMAGE%%:<version>-onbuild`
 
 The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076).
 

diff --git a/.template-helpers/variant-slim.md b/.template-helpers/variant-slim.md
@@ -1,3 +1,3 @@
-## `%%IMAGE%%:slim`
+## `%%IMAGE%%:<version>-slim`
 
 This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run `%%IMAGE%%`. Unless you are working in an environment where *only* the `%%IMAGE%%` image will be deployed and you have space constraints, we highly recommend using the default image of this repository.
diff --git a/.template-helpers/variant-windowsservercore.md b/.template-helpers/variant-windowsservercore.md
@@ -1,4 +1,4 @@
-## `%%IMAGE%%:windowsservercore`
+## `%%IMAGE%%:<version>-windowsservercore`
 
 This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
 

diff --git a/openjdk/variant-slim.md b/openjdk/variant-slim.md
@@ -1,3 +1,3 @@
-## `%%IMAGE%%:slim`
+## `%%IMAGE%%:<version>-slim`
 
 This image installs the `-headless` package of OpenJDK and so is missing many of the UI-related Java libraries and some common packages contained in the default tag. It only contains the minimal packages needed to run Java. Unless you are working in an environment where *only* the `%%IMAGE%%` image will be deployed and you have space constraints, we highly recommend using the default image of this repository.
diff --git a/python/variant-onbuild.md b/python/variant-onbuild.md
diff --git a/znc/variant-slim.md b/znc/variant-slim.md
@@ -1,3 +1,3 @@
-## `%%REPO%%:slim`
+## `%%REPO%%:<version>-slim`
 
 This image is smaller, but it doesn't support external modules. If you need any external C++, Perl or Python module, use `latest` instead of `slim`.