Merge branch 'master' into mww-190404-reverse-up

fnproject · May 8, 2019 · 79daa42 · 79daa42
2 parents ee86024 + 45da3e0
commit 79daa42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/images/runtime/Dockerfile-jre11 b/images/runtime/Dockerfile-jre11
@@ -4,6 +4,8 @@ COPY src/main/c/libfnunixsocket.so /function/runtime/lib/
 
 RUN ["/usr/bin/java", "-Xshare:dump"]
 
+RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn
+
 # The UseExeperimentalVMOptions, UseCGroupMemoryLimitForHeap and MaxRAMFraction options that were used in the JDK 9 builds are
 # no longer supported in JDK 11 - so these have been removed. We now rely on the built-in ContainerSupport option that Linux JDKs
 # use to configure themselves when detecting they are running in a container.

diff --git a/infra/update/functions/Jenkinsfile b/infra/update/functions/Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent any
     parameters {
-        string(name: 'IMAGE', defaultValue: 'registry.oracledx.com/skeppare/functions-service:latest', description: 'Which image to use (full repository:tag, e.g. fnproject/functions:latest)')
+        string(name: 'IMAGE', defaultValue: 'registry.oracledx.com/skeppare/functions-service:latest', description: 'Which image to use (full repository:tag, e.g. fnproject/fnserver:latest)')
         string(name: 'SOURCE_REPO', defaultValue: '[email protected]:fnproject/fn.git', description: 'Which git repo to use to build the CLI tool')
         string(name: 'SOURCE_BRANCH', defaultValue: 'master', description: 'Which git repo branch to use to build the CLI tool')
     }

diff --git a/release.version b/release.version
@@ -1 +1 @@
-1.0.91
+1.0.93