Move "openjdk:X-jdk" tags to "SharedTags:" so that in 12+, they can be shared by Windows #273
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e shared by Windows
$ diff -u <(bashbrew cat openjdk) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63 2019-01-21 19:02:45.402966406 -0800
+++ /dev/fd/62 2019-01-21 19:02:45.402966406 -0800
@@ -1,7 +1,8 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/openjdk.git
-Tags: 13-ea-4-jdk-oraclelinux7, 13-ea-4-oraclelinux7, 13-ea-jdk-oraclelinux7, 13-ea-oraclelinux7, 13-jdk-oraclelinux7, 13-oraclelinux7, 13-ea-4-jdk-oracle, 13-ea-4-oracle, 13-ea-jdk-oracle, 13-ea-oracle, 13-jdk-oracle, 13-oracle, 13-ea-4-jdk, 13-ea-4, 13-ea-jdk, 13-ea, 13-jdk, 13
+Tags: 13-ea-4-jdk-oraclelinux7, 13-ea-4-oraclelinux7, 13-ea-jdk-oraclelinux7, 13-ea-oraclelinux7, 13-jdk-oraclelinux7, 13-oraclelinux7, 13-ea-4-jdk-oracle, 13-ea-4-oracle, 13-ea-jdk-oracle, 13-ea-oracle, 13-jdk-oracle, 13-oracle
+SharedTags: 13-ea-4-jdk, 13-ea-4, 13-ea-jdk, 13-ea, 13-jdk, 13
GitCommit: 765ef28d1bb2c8d1aef7d072dadea5db41d8ced3
Directory: 13/jdk/oracle
@@ -10,28 +11,28 @@
Directory: 13/jdk/alpine
Tags: 13-ea-4-jdk-windowsservercore-ltsc2016, 13-ea-4-windowsservercore-ltsc2016, 13-ea-jdk-windowsservercore-ltsc2016, 13-ea-windowsservercore-ltsc2016, 13-jdk-windowsservercore-ltsc2016, 13-windowsservercore-ltsc2016
-SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore
+SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore, 13-ea-4-jdk, 13-ea-4, 13-ea-jdk, 13-ea, 13-jdk, 13
Architectures: windows-amd64
GitCommit: 765ef28d1bb2c8d1aef7d072dadea5db41d8ced3
Directory: 13/jdk/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
Tags: 13-ea-4-jdk-windowsservercore-1709, 13-ea-4-windowsservercore-1709, 13-ea-jdk-windowsservercore-1709, 13-ea-windowsservercore-1709, 13-jdk-windowsservercore-1709, 13-windowsservercore-1709
-SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore
+SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore, 13-ea-4-jdk, 13-ea-4, 13-ea-jdk, 13-ea, 13-jdk, 13
Architectures: windows-amd64
GitCommit: 765ef28d1bb2c8d1aef7d072dadea5db41d8ced3
Directory: 13/jdk/windows/windowsservercore-1709
Constraints: windowsservercore-1709
Tags: 13-ea-4-jdk-windowsservercore-1803, 13-ea-4-windowsservercore-1803, 13-ea-jdk-windowsservercore-1803, 13-ea-windowsservercore-1803, 13-jdk-windowsservercore-1803, 13-windowsservercore-1803
-SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore
+SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore, 13-ea-4-jdk, 13-ea-4, 13-ea-jdk, 13-ea, 13-jdk, 13
Architectures: windows-amd64
GitCommit: 765ef28d1bb2c8d1aef7d072dadea5db41d8ced3
Directory: 13/jdk/windows/windowsservercore-1803
Constraints: windowsservercore-1803
Tags: 13-ea-4-jdk-windowsservercore-1809, 13-ea-4-windowsservercore-1809, 13-ea-jdk-windowsservercore-1809, 13-ea-windowsservercore-1809, 13-jdk-windowsservercore-1809, 13-windowsservercore-1809
-SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore
+SharedTags: 13-ea-4-jdk-windowsservercore, 13-ea-4-windowsservercore, 13-ea-jdk-windowsservercore, 13-ea-windowsservercore, 13-jdk-windowsservercore, 13-windowsservercore, 13-ea-4-jdk, 13-ea-4, 13-ea-jdk, 13-ea, 13-jdk, 13
Architectures: windows-amd64
GitCommit: 765ef28d1bb2c8d1aef7d072dadea5db41d8ced3
Directory: 13/jdk/windows/windowsservercore-1809
@@ -44,7 +45,8 @@
Directory: 13/jdk/windows/nanoserver-sac2016
Constraints: nanoserver-sac2016
-Tags: 12-ea-28-jdk-oraclelinux7, 12-ea-28-oraclelinux7, 12-ea-jdk-oraclelinux7, 12-ea-oraclelinux7, 12-jdk-oraclelinux7, 12-oraclelinux7, 12-ea-28-jdk-oracle, 12-ea-28-oracle, 12-ea-jdk-oracle, 12-ea-oracle, 12-jdk-oracle, 12-oracle, 12-ea-28-jdk, 12-ea-28, 12-ea-jdk, 12-ea, 12-jdk, 12
+Tags: 12-ea-28-jdk-oraclelinux7, 12-ea-28-oraclelinux7, 12-ea-jdk-oraclelinux7, 12-ea-oraclelinux7, 12-jdk-oraclelinux7, 12-oraclelinux7, 12-ea-28-jdk-oracle, 12-ea-28-oracle, 12-ea-jdk-oracle, 12-ea-oracle, 12-jdk-oracle, 12-oracle
+SharedTags: 12-ea-28-jdk, 12-ea-28, 12-ea-jdk, 12-ea, 12-jdk, 12
GitCommit: d283315254bbaadabfe76ef0ebfda770debabfdb
Directory: 12/jdk/oracle
@@ -53,28 +55,28 @@
Directory: 12/jdk/alpine
Tags: 12-ea-28-jdk-windowsservercore-ltsc2016, 12-ea-28-windowsservercore-ltsc2016, 12-ea-jdk-windowsservercore-ltsc2016, 12-ea-windowsservercore-ltsc2016, 12-jdk-windowsservercore-ltsc2016, 12-windowsservercore-ltsc2016
-SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore
+SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore, 12-ea-28-jdk, 12-ea-28, 12-ea-jdk, 12-ea, 12-jdk, 12
Architectures: windows-amd64
GitCommit: d283315254bbaadabfe76ef0ebfda770debabfdb
Directory: 12/jdk/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
Tags: 12-ea-28-jdk-windowsservercore-1709, 12-ea-28-windowsservercore-1709, 12-ea-jdk-windowsservercore-1709, 12-ea-windowsservercore-1709, 12-jdk-windowsservercore-1709, 12-windowsservercore-1709
-SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore
+SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore, 12-ea-28-jdk, 12-ea-28, 12-ea-jdk, 12-ea, 12-jdk, 12
Architectures: windows-amd64
GitCommit: d283315254bbaadabfe76ef0ebfda770debabfdb
Directory: 12/jdk/windows/windowsservercore-1709
Constraints: windowsservercore-1709
Tags: 12-ea-28-jdk-windowsservercore-1803, 12-ea-28-windowsservercore-1803, 12-ea-jdk-windowsservercore-1803, 12-ea-windowsservercore-1803, 12-jdk-windowsservercore-1803, 12-windowsservercore-1803
-SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore
+SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore, 12-ea-28-jdk, 12-ea-28, 12-ea-jdk, 12-ea, 12-jdk, 12
Architectures: windows-amd64
GitCommit: d283315254bbaadabfe76ef0ebfda770debabfdb
Directory: 12/jdk/windows/windowsservercore-1803
Constraints: windowsservercore-1803
Tags: 12-ea-28-jdk-windowsservercore-1809, 12-ea-28-windowsservercore-1809, 12-ea-jdk-windowsservercore-1809, 12-ea-windowsservercore-1809, 12-jdk-windowsservercore-1809, 12-windowsservercore-1809
-SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore
+SharedTags: 12-ea-28-jdk-windowsservercore, 12-ea-28-windowsservercore, 12-ea-jdk-windowsservercore, 12-ea-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore, 12-ea-28-jdk, 12-ea-28, 12-ea-jdk, 12-ea, 12-jdk, 12
Architectures: windows-amd64
GitCommit: d283315254bbaadabfe76ef0ebfda770debabfdb
Directory: 12/jdk/windows/windowsservercore-1809
@@ -91,7 +93,8 @@
GitCommit: 2ac692bcec79f6ffe1c26b3bfc79eb9b1beae885
Directory: 11/jdk/oracle
-Tags: 11.0.1-jdk-stretch, 11.0.1-stretch, 11.0-jdk-stretch, 11.0-stretch, 11-jdk-stretch, 11-stretch, jdk-stretch, stretch, 11.0.1-jdk, 11.0.1, 11.0-jdk, 11.0, 11-jdk, 11, jdk, latest
+Tags: 11.0.1-jdk-stretch, 11.0.1-stretch, 11.0-jdk-stretch, 11.0-stretch, 11-jdk-stretch, 11-stretch, jdk-stretch, stretch
+SharedTags: 11.0.1-jdk, 11.0.1, 11.0-jdk, 11.0, 11-jdk, 11, jdk, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 258870647c5a4281c4cc81d0d17b6fd95bcf4141
Directory: 11/jdk
@@ -136,7 +139,8 @@
Directory: 11/jdk/windows/nanoserver-sac2016
Constraints: nanoserver-sac2016
-Tags: 11.0.1-jre-stretch, 11.0-jre-stretch, 11-jre-stretch, jre-stretch, 11.0.1-jre, 11.0-jre, 11-jre, jre
+Tags: 11.0.1-jre-stretch, 11.0-jre-stretch, 11-jre-stretch, jre-stretch
+SharedTags: 11.0.1-jre, 11.0-jre, 11-jre, jre
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 258870647c5a4281c4cc81d0d17b6fd95bcf4141
Directory: 11/jre
@@ -146,7 +150,8 @@
GitCommit: 258870647c5a4281c4cc81d0d17b6fd95bcf4141
Directory: 11/jre/slim
-Tags: 8u181-jdk-stretch, 8u181-stretch, 8-jdk-stretch, 8-stretch, 8u181-jdk, 8u181, 8-jdk, 8
+Tags: 8u181-jdk-stretch, 8u181-stretch, 8-jdk-stretch, 8-stretch
+SharedTags: 8u181-jdk, 8u181, 8-jdk, 8
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jdk
@@ -196,7 +201,8 @@
Directory: 8/jdk/windows/nanoserver-sac2016
Constraints: nanoserver-sac2016
-Tags: 8u181-jre-stretch, 8-jre-stretch, 8u181-jre, 8-jre
+Tags: 8u181-jre-stretch, 8-jre-stretch
+SharedTags: 8u181-jre, 8-jre
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jre
@@ -211,7 +217,8 @@
GitCommit: 38cb0eb077acf2a429f32a879903cd305733d561
Directory: 8/jre/alpine
-Tags: 7u181-jdk-jessie, 7u181-jessie, 7-jdk-jessie, 7-jessie, 7u181-jdk, 7u181, 7-jdk, 7
+Tags: 7u181-jdk-jessie, 7u181-jessie, 7-jdk-jessie, 7-jessie
+SharedTags: 7u181-jdk, 7u181, 7-jdk, 7
Architectures: amd64, arm32v5, arm32v7, i386
GitCommit: 5a23ec5ab11beacb71f89ec9f9935c52ab7e44bb
Directory: 7/jdk
@@ -226,7 +233,8 @@
GitCommit: 1778c73b834d04d5b5c61baee4cce8c127031f9c
Directory: 7/jdk/alpine
-Tags: 7u181-jre-jessie, 7-jre-jessie, 7u181-jre, 7-jre
+Tags: 7u181-jre-jessie, 7-jre-jessie
+SharedTags: 7u181-jre, 7-jre
Architectures: amd64, arm32v5, arm32v7, i386
GitCommit: 5a23ec5ab11beacb71f89ec9f9935c52ab7e44bb
Directory: 7/jre |
yosifkit
approved these changes
Jan 23, 2019
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Jan 25, 2019
- `ghost`: 2.12.0 - `julia`: 1.1 (deprecated 0.7) - `mongo`: 3.4.19 - `openjdk`: 13-ea+5, 12-ea+29, windows ojdkbuild 1.8.0.201-1, use `SharedTags:` for 12+ (docker-library/openjdk#273) - `pypy`: pip 19.0.1 - `python`: pip 19.0.1 - `redmine`: Ruby 2.6 (docker-library/redmine#152)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #223
This means that once 12 hits GA, we'll move
latestover to 12 anddocker run openjdk:12will "just work" on both Windows and Linux! 🎉(We couldn't do this prior because we had mixed build sources, where in 12+ all artifacts come from https://jdk.java.net/ consistently. 🤘)
This also adjusts 7, 8, and 11 to use
SharedTags:with only a single entry in them, but that's harmless (and will make this switch more obvious in the documentation update, since they'll still be listed under "Shared Tags" but only with a single image contained therein).