@@ -7,7 +7,8 @@ ENV PATH /var/opt/apache-maven/bin:$PATH
 
 ARG IMAGE_TEMPLATE=/image-template
 ARG FUNCTION_TEMPLATE=/function-template
-ARG servers=1
+ARG SERVERS=1
+ARG FUNKY_VERSION
 
 LABEL io.dispatchframework.imageTemplate="${IMAGE_TEMPLATE}" \
       io.dispatchframework.functionTemplate="${FUNCTION_TEMPLATE}"
@@ -24,15 +25,12 @@ WORKDIR /function-server
 RUN mvn install && cd cp-gen && mvn dependency:build-classpath -Dmdep.outputFile=../cp.txt
 
 
-ENV WORKDIR=/function PORT=8080 SERVERS=$servers FUNKY_VERSION=0.1.2
+ENV WORKDIR=/function PORT=8080 SERVERS=${SERVERS} TIMEOUT=300
 
 EXPOSE ${PORT}
 WORKDIR ${WORKDIR}
 
 RUN curl -L https://github.com/dispatchframework/funky/releases/download/${FUNKY_VERSION}/funky${FUNKY_VERSION}.linux-amd64.tgz -o funky${FUNKY_VERSION}.linux-amd64.tgz
 RUN tar -xzf funky${FUNKY_VERSION}.linux-amd64.tgz
 
-# OpenFaaS readiness check depends on this file
-RUN touch /tmp/.lock
-
 CMD SERVER_CMD="java -cp target/classes:$(<./cp.txt):$(</function-server/cp.txt) io.dispatchframework.javabaseimage.Entrypoint $(cat /tmp/handler)" ./funky
@@ -5,8 +5,10 @@ set -e -x
 
 cd $(dirname $0)
 
-IMAGE=${DOCKER_REGISTRY}/java-base:$(cat version.txt)
-docker build -t ${IMAGE} .
+FUNKY_VERSION=$(jq -r .funky < version.json)
+
+IMAGE=${DOCKER_REGISTRY}/java-base:$(jq -r .tag < version.json)
+docker build -t ${IMAGE} --build-arg=FUNKY_VERSION=${FUNKY_VERSION} .
 if [ -n "$PUSH" ]; then
     docker push ${IMAGE}
 fi
@@ -0,0 +1,4 @@
+{
+    "tag": "0.0.13-knative",
+    "funky": "0.1.4-knative"
+}
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +    "tag": "0.0.13-knative",
 +    "funky": "0.1.4-knative"
 +}