Merge pull request #73 from groovy/temurin

 Switch to Eclipse Temurin as base image

Author: keeganwitt

.github/workflows/ci.yaml

@@ -11,24 +11,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jvmType: [jdk, jre]
-        version: [8, 11, 16]
+        version: [8, 11, 17]
     steps:
       - name: checkout
         uses: actions/checkout@v2
       - name: build
         env:
-          jvmType: ${{ matrix.jvmType }}
           version: ${{ matrix.version }}
         run: |
-          cd "${jvmType}${version}"
-          docker pull "adoptopenjdk:${version}-${jvmType}-hotspot"
-          docker build --tag "groovy:${jvmType}${version}" .
+          cd "jdk${version}"
+          docker pull "eclipse-temurin:${version}-jdk"
+          docker build --tag "groovy:jdk${version}" .
       - name: test
         env:
-          jvmType: ${{ matrix.jvmType }}
           version: ${{ matrix.version }}
           expectedGroovyVersion: 3.0.9
         run: |
           cd test
-          ./run.sh "groovy:${jvmType}${version}" "${expectedGroovyVersion}"
+          ./run.sh "groovy:jdk${version}" "${expectedGroovyVersion}"

README.md

@@ -2,14 +2,9 @@
 
 ## Supported tags and respective Dockerfile links
 
-* [jdk8, jdk](https://github.com/groovy/docker-groovy/blob/master/jdk8/Dockerfile)
-* [latest, jre8, jre](https://github.com/groovy/docker-groovy/blob/master/jre8/Dockerfile)
-
+* [jdk8](https://github.com/groovy/docker-groovy/blob/master/jdk8/Dockerfile)
 * [jdk11](https://github.com/groovy/docker-groovy/blob/master/jdk11/Dockerfile)
-* [jre11](https://github.com/groovy/docker-groovy/blob/master/jre11/Dockerfile)
-
-* [jdk16](https://github.com/groovy/docker-groovy/blob/master/jdk16/Dockerfile)
-* [jre16](https://github.com/groovy/docker-groovy/blob/master/jre16/Dockerfile)
+* [jdk17, jdk, latest](https://github.com/groovy/docker-groovy/blob/master/jdk17/Dockerfile)
 
 ## What is Groovy?
 

jdk11/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jdk-hotspot
+FROM eclipse-temurin:11-jdk
 
 CMD ["groovysh"]
 

jdk16/Dockerfile renamed to jdk17/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jdk-hotspot
+FROM eclipse-temurin:17-jdk
 
 CMD ["groovysh"]
 

jdk8/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:8-jdk-hotspot
+FROM eclipse-temurin:8-jdk
 
 CMD ["groovysh"]