Fix and simplify Dockerfile

template/kotlin-quarkus-native/Dockerfile

@@ -1,46 +1,35 @@
 # Gradle caching workaround
-FROM gradle:6.0.1-jdk11 as cache
+FROM quay.io/quarkus/ubi-quarkus-native-image:21.3.0-java11 as builder
+USER root
+
 ENV APP_HOME /app
-RUN mkdir -p /home/gradle/cache_home
 ENV GRADLE_USER_HOME /home/gradle/cache_home
-WORKDIR $APP_HOME/function
-COPY function/build.gradle.kts function/settings.gradle.kts $APP_HOME/function/
-RUN gradle -version
 
-# Get a build environment
-FROM oracle/graalvm-ce:19.2.1 as build-aot
-FROM gradle:6.0.1-jdk11 as builder
-ENV APP_HOME /app
-ENV JAVA_HOME /opt/graalvm-ce-19.2.1/
-ENV PATH $JAVA_HOME/bin:$PATH
-RUN apt-get update && apt-get install -y gcc zlib1g-dev
-COPY --from=build-aot /opt/graalvm-ce-19.2.1 /opt/graalvm-ce-19.2.1
-RUN gu install native-image
-COPY --from=cache /home/gradle/cache_home /home/gradle/.gradle
-COPY ./function $APP_HOME/function/
-WORKDIR $APP_HOME/function
+COPY gradlew $APP_HOME/
+COPY gradle $APP_HOME/gradle
+RUN mkdir -p /home/gradle/cache_home
+
+WORKDIR $APP_HOME
+RUN ./gradlew -version
 
 # At this point the native image is built
-RUN gradle --stacktrace buildNative
+COPY ./function $APP_HOME/function/
+RUN ./gradlew -p function --stacktrace build
 
 FROM openfaas/of-watchdog:0.7.3 as watchdog
 
 # Create new image from alpine
 FROM frolvlad/alpine-glibc:alpine-3.10
-RUN apk add --no-cache ca-certificates
+RUN apk --no-cache add ca-certificates curl libstdc++
 
 RUN addgroup -S app && adduser -S -g app app
 
-RUN apk --no-cache add ca-certificates curl
-
 WORKDIR /root/
 
 RUN mkdir -p /home/app
 
 # Wrapper/boot-strapper
 WORKDIR /home/app
-# Copy the SUNEC lib from graal to the final image
-COPY --from=build-aot /opt/graalvm-ce-19.2.1/jre/lib/amd64/libsunec.so /usr/lib/libsunec.so
 # Copy generated native executable from build-aot
 COPY --from=builder /app/function/build/*-runner /usr/bin/function
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
@@ -57,4 +46,4 @@ ENV read_timeout="25s"
 
 HEALTHCHECK --interval=1s CMD [ -e /tmp/.lock ] || exit 1
 
-CMD ["fwatchdog"]
+CMD ["fwatchdog"]

template/kotlin-quarkus-native/function/build.gradle.kts

@@ -1,15 +1,11 @@
-import io.quarkus.gradle.tasks.QuarkusDev
-import io.quarkus.gradle.tasks.QuarkusNative
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 group = "com.openfaas"
 
 plugins {
     java
-    id("io.quarkus") version "1.0.1.Final"
+    id("io.quarkus")
 
-    kotlin("jvm") version "1.3.61"
-    id("org.jetbrains.kotlin.plugin.allopen") version "1.3.61"
+    kotlin("jvm") version "1.6.0"
+    id("org.jetbrains.kotlin.plugin.allopen") version "1.6.0"
 }
 
 repositories {
@@ -20,9 +16,9 @@ fun org.gradle.kotlin.dsl.DependencyHandlerScope.quarkus(module: String) =
     "io.quarkus:quarkus-$module"
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-
-    implementation(enforcedPlatform("io.quarkus:quarkus-bom:1.0.1.Final"))
+    //implementation(kotlin("stdlib-jdk11"))
+    
+    implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:2.5.0.Final"))
     implementation(quarkus("kotlin"))
     implementation(quarkus("resteasy"))
     implementation(quarkus("resteasy-jsonb"))
@@ -31,18 +27,6 @@ dependencies {
     testImplementation("io.rest-assured:rest-assured")
 }
 
-tasks {
-    withType<QuarkusNative> {
-        isEnableHttpUrlHandler = true
-    }
-    withType<QuarkusDev> {
-        setSourceDir("$projectDir/src/main/kotlin")
-    }
-    withType<KotlinCompile>{
-        kotlinOptions.jvmTarget = "1.8"
-    }
-}
-
 quarkus {
     setOutputDirectory("$projectDir/build/classes/kotlin/main")
 }
@@ -54,6 +38,6 @@ allOpen {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}

template/kotlin-quarkus-native/function/settings.gradle.kts

@@ -4,13 +4,9 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "io.quarkus") {
-                useModule("io.quarkus:quarkus-gradle-plugin:1.0.1.Final")
-            }
-        }
+    plugins {
+        id("io.quarkus") version "2.5.0.Final"
     }
 }
 
-rootProject.name = "function"
+rootProject.name = "function"

template/kotlin-quarkus-native/function/src/main/resources/application.properties

@@ -1,3 +1,6 @@
 # Configuration file
 # key = value
-quarkus.http.port=8000
+quarkus.http.port=8000
+
+quarkus.package.type=native
+quarkus.native.container-build=false

template/kotlin-quarkus-native/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

template/kotlin-quarkus-native/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"