Skip to content

Commit 79daa42

Browse files
Merge branch 'master' into mww-190404-reverse-up
2 parents ee86024 + 45da3e0 commit 79daa42

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

images/runtime/Dockerfile-jre11

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ COPY src/main/c/libfnunixsocket.so /function/runtime/lib/
44

55
RUN ["/usr/bin/java", "-Xshare:dump"]
66

7+
RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn
8+
79
# The UseExeperimentalVMOptions, UseCGroupMemoryLimitForHeap and MaxRAMFraction options that were used in the JDK 9 builds are
810
# no longer supported in JDK 11 - so these have been removed. We now rely on the built-in ContainerSupport option that Linux JDKs
911
# use to configure themselves when detecting they are running in a container.

infra/update/functions/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pipeline {
22
agent any
33
parameters {
4-
string(name: 'IMAGE', defaultValue: 'registry.oracledx.com/skeppare/functions-service:latest', description: 'Which image to use (full repository:tag, e.g. fnproject/functions:latest)')
4+
string(name: 'IMAGE', defaultValue: 'registry.oracledx.com/skeppare/functions-service:latest', description: 'Which image to use (full repository:tag, e.g. fnproject/fnserver:latest)')
55
string(name: 'SOURCE_REPO', defaultValue: 'git@github.com:fnproject/fn.git', description: 'Which git repo to use to build the CLI tool')
66
string(name: 'SOURCE_BRANCH', defaultValue: 'master', description: 'Which git repo branch to use to build the CLI tool')
77
}

release.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.91
1+
1.0.93

0 commit comments

Comments
 (0)