Use JRE instead of JDK for 11 runtime image, and add push of 11 images into CI release.sh

Author: rikgibson

.circleci/release.sh

@@ -72,6 +72,19 @@ mvn -s ./settings-deploy.xml \
   docker push ${USER}/${BUILD_IMAGE}:jdk9-${release_version}
   docker push ${USER}/${BUILD_IMAGE}:jdk9-${moving_version}
 
+  ## jre11 runtime
+  docker tag ${USER}/${RUNTIME_IMAGE}:jre11-${release_version} ${USER}/${RUNTIME_IMAGE}:jre11-latest
+  docker tag ${USER}/${RUNTIME_IMAGE}:jre11-${release_version} ${USER}/${RUNTIME_IMAGE}:jre11-${moving_version}
+  docker push ${USER}/${RUNTIME_IMAGE}:jre11-latest
+  docker push ${USER}/${RUNTIME_IMAGE}:jre11-${release_version}
+  docker push ${USER}/${RUNTIME_IMAGE}:jre11-${moving_version}
+
+  ## jdk11 build
+  docker tag ${USER}/${BUILD_IMAGE}:jdk11-${release_version} ${USER}/${BUILD_IMAGE}:jdk11-latest
+  docker tag ${USER}/${BUILD_IMAGE}:jdk11-${release_version} ${USER}/${BUILD_IMAGE}:jdk11-${moving_version}
+  docker push ${USER}/${BUILD_IMAGE}:jdk11-latest
+  docker push ${USER}/${BUILD_IMAGE}:jdk11-${release_version}
+  docker push ${USER}/${BUILD_IMAGE}:jdk11-${moving_version}
 
   ##  native init image
   docker tag ${USER}/${NATIVE_INIT_IMAGE}:${release_version} ${USER}/${NATIVE_INIT_IMAGE}:latest

build.sh

@@ -43,7 +43,7 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 (
    cd runtime
    docker build -f ../images/runtime/Dockerfile-jdk9 -t fnproject/fn-java-fdk:jdk9-${BUILD_VERSION} .
-   docker build -f ../images/runtime/Dockerfile-jdk11 -t fnproject/fn-java-fdk:jdk11-${BUILD_VERSION} .
+   docker build -f ../images/runtime/Dockerfile-jre11 -t fnproject/fn-java-fdk:jre11-${BUILD_VERSION} .
 )
 
 (

images/init-native/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fdk.version>1.0.76</fdk.version>
+        <fdk.version>1.0.79</fdk.version>
     </properties>
     <groupId>com.example.fn</groupId>
     <artifactId>hello</artifactId>

images/runtime/Dockerfile-jdk11 images/runtime/Dockerfile-jre11images/runtime/Dockerfile-jdk11 renamed to images/runtime/Dockerfile-jre11

@@ -1,4 +1,4 @@
-FROM openjdk:11-jdk-slim
+FROM openjdk:11-jre-slim
 COPY target/runtime-*.jar target/dependency/*.jar /function/runtime/
 COPY src/main/c/libfnunixsocket.so /function/runtime/lib/