Skip to content

Commit

Permalink
Merge pull request #59 from oleg-nenashev/alpine-switch-adoptopenjdk
Browse files Browse the repository at this point in the history
Switch the JDK 8 Alpine image to AdoptOpenJDK
  • Loading branch information
oleg-nenashev authored Aug 13, 2020
2 parents 833bad1 + d49e2d7 commit faf57a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions 8/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License
#
# Copyright (c) 2019 Fabio Kruger
# Copyright (c) 2019-2020 Fabio Kruger and other contributors
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand All @@ -20,7 +20,10 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

FROM openjdk:8-jdk-alpine3.9
# 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:jdk8u262-b10-alpine

ARG user=jenkins
ARG group=jenkins
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The image has several supported configurations, which can be accessed via the fo

* `latest`: Latest version with the newest remoting (based on `openjdk:8-jdk`)
* `jdk11`: Latest version with the newest remoting and Java 11 (based on `openjdk:11-jdk`)
* `alpine`: Small image based on Alpine Linux (based on `openjdk:8-jdk-alpine`)
* `alpine`: Small image based on Alpine Linux (based on `adoptopenjdk/openjdk8:jdk8u${version}-alpine`)
* `jdk8-windowsservercore-1809`: Latest version with the newest remoting (based on `adoptopenjdk:8-jdk-hotspot-windowsservercore-1809`)
* `jdk11-windowsservercore-1809`: Latest version with the newest remoting and Java 11 (based on `adoptopenjdk:11-jdk-hotspot-windowsservercore-1809`)
* `jdk8-nanoserver-1809`: Latest version with the newest remoting with Windows Nano Server
Expand Down

0 comments on commit faf57a6

Please sign in to comment.