Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 8/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# FIXME(oleg_nenashev): This is not an official AdoptOpenJDK Docker Image.
# There is no official Alpine images at the moment.
# Needs upgrade when/if there is an official alpine image.
FROM adoptopenjdk/openjdk8:x86_64-alpine-jdk8u322-b06
FROM adoptopenjdk/openjdk8:x86_64-alpine-jdk8u332-b09
Comment on lines 23 to +26
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# FIXME(oleg_nenashev): This is not an official AdoptOpenJDK Docker Image.
# There is no official Alpine images at the moment.
# Needs upgrade when/if there is an official alpine image.
FROM adoptopenjdk/openjdk8:x86_64-alpine-jdk8u322-b06
FROM adoptopenjdk/openjdk8:x86_64-alpine-jdk8u332-b09
FROM eclipse-temurin:8u332-b09-jre-alpine

There is (now) an official temurin alpine distribution (only Intel though, but @gounthar is on the case for ARM support in the future ;) )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've not been able to make the tests pass with the change from the adoptopenjdk to the eclipse-temurin image. I had tried it previously without success and decided that it would be better to leave it for another pull request.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Then let's proceed to merging this PR: I've opened #119 as a draft for the switch to temurin then


ARG user=jenkins
ARG group=jenkins
Expand Down
2 changes: 1 addition & 1 deletion 8/bullseye/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

FROM eclipse-temurin:8u322-b06-jdk-focal AS jre-build
FROM eclipse-temurin:8u332-b09-jdk-focal AS jre-build

FROM debian:bullseye-20220418

Expand Down
4 changes: 2 additions & 2 deletions 8/windows/nanoserver-ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ FROM mcr.microsoft.com/powershell:${POWERSHELL_VERSION}nanoserver-1809

SHELL ["pwsh.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ARG JAVA_VERSION=8u322-b06
ARG JAVA_SHA256=c9e06afb5df850e90a4da9da31c2edf10bd6da9962c4b253e91b41237f8fb2fb
ARG JAVA_VERSION=8u332-b09
ARG JAVA_SHA256=780bc92292e3f9899235457189d7aa6943833c9f426d104931d399bc404c89d3
ARG JAVA_HOME=C:\jdk${JAVA_VERSION}

USER ContainerAdministrator
Expand Down