Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Debian variants of Oracle-consuming versions #355

Merged
merged 1 commit into from
Sep 18, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 6, 2019

These are images based on the official JDK artifacts for 12+ released on https://jdk.java.net/ with a Debian base in addition to Oracle.

Closes #302

A Useful Diff:
$ diff -u <(bashbrew cat openjdk) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2019-09-06 12:13:35.609665720 -0700
+++ /dev/fd/62	2019-09-06 12:13:35.609665720 -0700
@@ -7,6 +7,14 @@
 Directory: 14/jdk/oracle
 Constraints: !aufs
 
+Tags: 14-ea-13-jdk-buster, 14-ea-13-buster, 14-ea-jdk-buster, 14-ea-buster, 14-jdk-buster, 14-buster
+GitCommit: b26a21dd82ee269efe26a9407eff9235bdde3dad
+Directory: 14/jdk
+
+Tags: 14-ea-13-jdk-slim-buster, 14-ea-13-slim-buster, 14-ea-jdk-slim-buster, 14-ea-slim-buster, 14-jdk-slim-buster, 14-slim-buster, 14-ea-13-jdk-slim, 14-ea-13-slim, 14-ea-jdk-slim, 14-ea-slim, 14-jdk-slim, 14-slim
+GitCommit: b26a21dd82ee269efe26a9407eff9235bdde3dad
+Directory: 14/jdk/slim
+
 Tags: 14-ea-12-jdk-alpine3.10, 14-ea-12-alpine3.10, 14-ea-jdk-alpine3.10, 14-ea-alpine3.10, 14-jdk-alpine3.10, 14-alpine3.10, 14-ea-12-jdk-alpine, 14-ea-12-alpine, 14-ea-jdk-alpine, 14-ea-alpine, 14-jdk-alpine, 14-alpine
 GitCommit: b57ab1457d190f313c46ffbec2b994b041b4d08c
 Directory: 14/jdk/alpine
@@ -38,6 +46,14 @@
 Directory: 13/jdk/oracle
 Constraints: !aufs
 
+Tags: 13-jdk-buster, 13-buster
+GitCommit: b26a21dd82ee269efe26a9407eff9235bdde3dad
+Directory: 13/jdk
+
+Tags: 13-jdk-slim-buster, 13-slim-buster, 13-jdk-slim, 13-slim
+GitCommit: b26a21dd82ee269efe26a9407eff9235bdde3dad
+Directory: 13/jdk/slim
+
 Tags: 13-jdk-windowsservercore-1809, 13-windowsservercore-1809
 SharedTags: 13-jdk-windowsservercore, 13-windowsservercore, 13-jdk, 13
 Architectures: windows-amd64
@@ -65,6 +81,14 @@
 Directory: 12/jdk/oracle
 Constraints: !aufs
 
+Tags: 12.0.2-jdk-buster, 12.0.2-buster, 12.0-jdk-buster, 12.0-buster, 12-jdk-buster, 12-buster, jdk-buster, buster
+GitCommit: b26a21dd82ee269efe26a9407eff9235bdde3dad
+Directory: 12/jdk
+
+Tags: 12.0.2-jdk-slim-buster, 12.0.2-slim-buster, 12.0-jdk-slim-buster, 12.0-slim-buster, 12-jdk-slim-buster, 12-slim-buster, jdk-slim-buster, slim-buster, 12.0.2-jdk-slim, 12.0.2-slim, 12.0-jdk-slim, 12.0-slim, 12-jdk-slim, 12-slim, jdk-slim, slim
+GitCommit: b26a21dd82ee269efe26a9407eff9235bdde3dad
+Directory: 12/jdk/slim
+
 Tags: 12.0.2-jdk-windowsservercore-1809, 12.0.2-windowsservercore-1809, 12.0-jdk-windowsservercore-1809, 12.0-windowsservercore-1809, 12-jdk-windowsservercore-1809, 12-windowsservercore-1809, jdk-windowsservercore-1809, windowsservercore-1809
 SharedTags: 12.0.2-jdk-windowsservercore, 12.0.2-windowsservercore, 12.0-jdk-windowsservercore, 12.0-windowsservercore, 12-jdk-windowsservercore, 12-windowsservercore, jdk-windowsservercore, windowsservercore, 12.0.2-jdk, 12.0.2, 12.0-jdk, 12.0, 12-jdk, 12, jdk, latest
 Architectures: windows-amd64

@tianon
Copy link
Member Author

tianon commented Sep 6, 2019

To my point in #302 (comment):

I do want to be very clear that if we reintroduce Debian variants for 12+ they will not match the existing Debian variants, which is a big point to hesitate on here IMO.

I think we're reasonably safe to reintroduce these given the amount of time that has now passed since the old versions were deprecated (including a major Debian release, so these are Buster-based instead of Stretch-based).

@yosifkit
Copy link
Member

yosifkit commented Sep 6, 2019

Should we add something like docker-library/php#542?

@tianon
Copy link
Member Author

tianon commented Sep 6, 2019

Oh, very interesting thought, although I think that's slightly orthogonal (given that we already have the Adopt variants for 8 and 11 which do not include something like that but could probably also benefit).

I think it's a little bit harder to achieve though given the varying nature of JRE/JDK package names (things like default-jre are a common dependency ☹️).

These are images based on the official JDK artifacts for 12+ released on https://jdk.java.net/ with a Debian base in addition to Oracle.
@tianon
Copy link
Member Author

tianon commented Sep 18, 2019

Rebased/updated 👍

@tianon
Copy link
Member Author

tianon commented Sep 18, 2019

... and now the relevant half of the CI is green 😄

@yosifkit yosifkit merged commit 545278c into docker-library:master Sep 18, 2019
@yosifkit yosifkit deleted the oracle-debian branch September 18, 2019 00:47
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Sep 18, 2019
Changes:

- docker-library/openjdk@545278c: Merge pull request docker-library/openjdk#355 from infosiftr/oracle-debian
- docker-library/openjdk@3d26403: Add Debian variants of Oracle-consuming versions
- docker-library/openjdk@ed26879: Adjust latest to 13 and remove 12 (now EOL)
tianon referenced this pull request in docker-library/official-images Oct 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Where's the OpenJDK 12 image?
2 participants