Update 11 images to use stretch-backports; yay stable #259
Conversation
This file contains hidden or 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
Also drop old ca-certificates-java fix
|
Tags may need a slight tweak: diff -u ../official-images/library/openjdk <(./generate-stackbrew-library.sh)
--- ../official-images/library/openjdk 2018-12-19 18:59:51.040872324 -0800
+++ /dev/fd/63 2018-12-21 15:47:36.329846110 -0800
@@ -40,14 +40,14 @@
GitCommit: 1ba292401cda0ed0b0c706c86b55d03dd5e27c5c
Directory: 11/jdk/oracle
-Tags: 11.0.1-jdk-sid, 11.0.1-sid, 11.0-jdk-sid, 11.0-sid, 11-jdk-sid, 11-sid, jdk-sid, sid, 11.0.1-jdk, 11.0.1, 11.0-jdk, 11.0, 11-jdk, 11, jdk, latest
+Tags: 11.0.1-jdk-stretch-backports, 11.0.1-stretch-backports, 11.0-jdk-stretch-backports, 11.0-stretch-backports, 11-jdk-stretch-backports, 11-stretch-backports, jdk-stretch-backports, stretch-backports, 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: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 11/jdk
-Tags: 11.0.1-jdk-slim-sid, 11.0.1-slim-sid, 11.0-jdk-slim-sid, 11.0-slim-sid, 11-jdk-slim-sid, 11-slim-sid, jdk-slim-sid, slim-sid, 11.0.1-jdk-slim, 11.0.1-slim, 11.0-jdk-slim, 11.0-slim, 11-jdk-slim, 11-slim, jdk-slim, slim
+Tags: 11.0.1-jdk-slim-stretch-backports, 11.0.1-slim-stretch-backports, 11.0-jdk-slim-stretch-backports, 11.0-slim-stretch-backports, 11-jdk-slim-stretch-backports, 11-slim-stretch-backports, jdk-slim-stretch-backports, slim-stretch-backports, 11.0.1-jdk-slim, 11.0.1-slim, 11.0-jdk-slim, 11.0-slim, 11-jdk-slim, 11-slim, jdk-slim, slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 11/jdk/slim
Tags: 11.0.1-jdk-windowsservercore-ltsc2016, 11.0.1-windowsservercore-ltsc2016, 11.0-jdk-windowsservercore-ltsc2016, 11.0-windowsservercore-ltsc2016, 11-jdk-windowsservercore-ltsc2016, 11-windowsservercore-ltsc2016, jdk-windowsservercore-ltsc2016, windowsservercore-ltsc2016
@@ -71,24 +71,24 @@
Directory: 11/jdk/windows/windowsservercore-1803
Constraints: windowsservercore-1803
-Tags: 11.0.1-jre-sid, 11.0-jre-sid, 11-jre-sid, jre-sid, 11.0.1-jre, 11.0-jre, 11-jre, jre
+Tags: 11.0.1-jre-stretch-backports, 11.0-jre-stretch-backports, 11-jre-stretch-backports, jre-stretch-backports, 11.0.1-jre, 11.0-jre, 11-jre, jre
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 11/jre
-Tags: 11.0.1-jre-slim-sid, 11.0-jre-slim-sid, 11-jre-slim-sid, jre-slim-sid, 11.0.1-jre-slim, 11.0-jre-slim, 11-jre-slim, jre-slim
+Tags: 11.0.1-jre-slim-stretch-backports, 11.0-jre-slim-stretch-backports, 11-jre-slim-stretch-backports, jre-slim-stretch-backports, 11.0.1-jre-slim, 11.0-jre-slim, 11-jre-slim, jre-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 11/jre/slim
Tags: 8u181-jdk-stretch, 8u181-stretch, 8-jdk-stretch, 8-stretch, 8u181-jdk, 8u181, 8-jdk, 8
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jdk
Tags: 8u181-jdk-slim-stretch, 8u181-slim-stretch, 8-jdk-slim-stretch, 8-slim-stretch, 8u181-jdk-slim, 8u181-slim, 8-jdk-slim, 8-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jdk/slim
Tags: 8u181-jdk-alpine3.8, 8u181-alpine3.8, 8-jdk-alpine3.8, 8-alpine3.8, 8u181-jdk-alpine, 8u181-alpine, 8-jdk-alpine, 8-alpine
@@ -126,12 +126,12 @@
Tags: 8u181-jre-stretch, 8-jre-stretch, 8u181-jre, 8-jre
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jre
Tags: 8u181-jre-slim-stretch, 8-jre-slim-stretch, 8u181-jre-slim, 8-jre-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jre/slim
Tags: 8u181-jre-alpine3.8, 8-jre-alpine3.8, 8u181-jre-alpine, 8-jre-alpine |
tianon
reviewed
Dec 24, 2018
|
Perhaps this will do the trick? (untested) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index f1a051d..fbf5615 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -187,7 +187,7 @@ for javaVersion in "${versions[@]}"; do
}
fromTag = $2
}
- $1 == "RUN" && $2 == "echo" && $4 == "http://deb.debian.org/debian" {
+ $1 == "RUN" && $2 == "echo" && $4 == "http://deb.debian.org/debian" && $5 !~ /-backports$/ {
fromTag = $5 # "experimental", etc
}
END { |
|
Updated diff: $ diff -u <(bashbrew cat openjdk) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63 2018-12-24 14:22:11.405457921 -0800
+++ /dev/fd/62 2018-12-24 14:22:11.405457921 -0800
@@ -34,14 +34,14 @@
GitCommit: 1ba292401cda0ed0b0c706c86b55d03dd5e27c5c
Directory: 11/jdk/oracle
-Tags: 11.0.1-jdk-sid, 11.0.1-sid, 11.0-jdk-sid, 11.0-sid, 11-jdk-sid, 11-sid, jdk-sid, sid, 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, 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: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: 63656af1180ca7727ff9e158fa1ee6d16997791c
Directory: 11/jdk
-Tags: 11.0.1-jdk-slim-sid, 11.0.1-slim-sid, 11.0-jdk-slim-sid, 11.0-slim-sid, 11-jdk-slim-sid, 11-slim-sid, jdk-slim-sid, slim-sid, 11.0.1-jdk-slim, 11.0.1-slim, 11.0-jdk-slim, 11.0-slim, 11-jdk-slim, 11-slim, jdk-slim, slim
+Tags: 11.0.1-jdk-slim-stretch, 11.0.1-slim-stretch, 11.0-jdk-slim-stretch, 11.0-slim-stretch, 11-jdk-slim-stretch, 11-slim-stretch, jdk-slim-stretch, slim-stretch, 11.0.1-jdk-slim, 11.0.1-slim, 11.0-jdk-slim, 11.0-slim, 11-jdk-slim, 11-slim, jdk-slim, slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: 63656af1180ca7727ff9e158fa1ee6d16997791c
Directory: 11/jdk/slim
Tags: 11.0.1-jdk-windowsservercore-ltsc2016, 11.0.1-windowsservercore-ltsc2016, 11.0-jdk-windowsservercore-ltsc2016, 11.0-windowsservercore-ltsc2016, 11-jdk-windowsservercore-ltsc2016, 11-windowsservercore-ltsc2016, jdk-windowsservercore-ltsc2016, windowsservercore-ltsc2016
@@ -65,24 +65,24 @@
Directory: 11/jdk/windows/windowsservercore-1803
Constraints: windowsservercore-1803
-Tags: 11.0.1-jre-sid, 11.0-jre-sid, 11-jre-sid, jre-sid, 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, 11.0.1-jre, 11.0-jre, 11-jre, jre
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: 63656af1180ca7727ff9e158fa1ee6d16997791c
Directory: 11/jre
-Tags: 11.0.1-jre-slim-sid, 11.0-jre-slim-sid, 11-jre-slim-sid, jre-slim-sid, 11.0.1-jre-slim, 11.0-jre-slim, 11-jre-slim, jre-slim
+Tags: 11.0.1-jre-slim-stretch, 11.0-jre-slim-stretch, 11-jre-slim-stretch, jre-slim-stretch, 11.0.1-jre-slim, 11.0-jre-slim, 11-jre-slim, jre-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 78e731d8ba269c8d50c0f4ad9ee431c1c32f179a
+GitCommit: 63656af1180ca7727ff9e158fa1ee6d16997791c
Directory: 11/jre/slim
Tags: 8u181-jdk-stretch, 8u181-stretch, 8-jdk-stretch, 8-stretch, 8u181-jdk, 8u181, 8-jdk, 8
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jdk
Tags: 8u181-jdk-slim-stretch, 8u181-slim-stretch, 8-jdk-slim-stretch, 8-slim-stretch, 8u181-jdk-slim, 8u181-slim, 8-jdk-slim, 8-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jdk/slim
Tags: 8u181-jdk-alpine3.8, 8u181-alpine3.8, 8-jdk-alpine3.8, 8-alpine3.8, 8u181-jdk-alpine, 8u181-alpine, 8-jdk-alpine, 8-alpine
@@ -120,12 +120,12 @@
Tags: 8u181-jre-stretch, 8-jre-stretch, 8u181-jre, 8-jre
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jre
Tags: 8u181-jre-slim-stretch, 8-jre-slim-stretch, 8u181-jre-slim, 8-jre-slim
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7a33416016b60c045cf0ba99e82617ed6c130595
+GitCommit: c3023e4da10d10e9c9775eabe2d7baac146e7ae1
Directory: 8/jre/slim
Tags: 8u181-jre-alpine3.8, 8-jre-alpine3.8, 8u181-jre-alpine, 8-jre-alpine |
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Dec 24, 2018
- `busybox`: buildroot 2018.11.1 (docker-library/busybox#56) - `ghost`: 2.9.1, remove 0.x (docker-library/ghost#167) - `joomla`: joomla-docker/docker-joomla#71 - `mariadb`: 10.2.20 - `mongo`: remove 3.2 (EOL as of September 2018; see https://www.mongodb.com/support-policy) - `openjdk`: `stretch`-based 11, cleaner `ca-certificates-java` workaround (docker-library/openjdk#259), 12-ea+25 - `python`: 3.6.8, 3.7.2 - `ruby`: rubygems 3.0.1
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.
Also drop old ca-certificates-java fix
Fixes #237