diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
index 5abe89e4e5..e7491f5b53 100755
--- a/deployment/docker/docker-compose.yml
+++ b/deployment/docker/docker-compose.yml
@@ -24,7 +24,7 @@ services:
- TZ=Europe/Berlin
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
- REMOTING_IDLE_CPU_LEVEL=1
things:
@@ -41,7 +41,7 @@ services:
- TZ=Europe/Berlin
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
- REMOTING_IDLE_CPU_LEVEL=1
things-search:
@@ -58,7 +58,7 @@ services:
- TZ=Europe/Berlin
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
- REMOTING_IDLE_CPU_LEVEL=1
concierge:
@@ -75,7 +75,7 @@ services:
- TZ=Europe/Berlin
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
- REMOTING_IDLE_CPU_LEVEL=1
connectivity:
@@ -93,7 +93,7 @@ services:
- TZ=Europe/Berlin
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
- REMOTING_IDLE_CPU_LEVEL=1
gateway:
@@ -115,7 +115,7 @@ services:
- BIND_HOSTNAME=0.0.0.0
- REMOTING_IDLE_CPU_LEVEL=1
- ENABLE_DUMMY_AUTH=true
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError
swagger-ui:
image: docker.io/swaggerapi/swagger-ui:v3.20.5
diff --git a/deployment/docker/sandbox/docker-compose.yml b/deployment/docker/sandbox/docker-compose.yml
index b5c5138535..a7528e7786 100644
--- a/deployment/docker/sandbox/docker-compose.yml
+++ b/deployment/docker/sandbox/docker-compose.yml
@@ -26,7 +26,7 @@ services:
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- REMOTING_IDLE_CPU_LEVEL=1
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
- MONGO_COLLECTION_NAME_SUFFIX_CLASS=
things:
@@ -44,7 +44,7 @@ services:
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- REMOTING_IDLE_CPU_LEVEL=1
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
- MONGO_COLLECTION_NAME_SUFFIX_CLASS=
things-search:
@@ -62,7 +62,7 @@ services:
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- REMOTING_IDLE_CPU_LEVEL=1
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
concierge:
init: true
@@ -79,7 +79,7 @@ services:
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- REMOTING_IDLE_CPU_LEVEL=1
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
connectivity:
init: true
@@ -97,7 +97,7 @@ services:
- INSTANCE_INDEX=1
- BIND_HOSTNAME=0.0.0.0
- REMOTING_IDLE_CPU_LEVEL=1
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
gateway:
init: true
@@ -117,7 +117,7 @@ services:
- REMOTING_IDLE_CPU_LEVEL=1
- ENABLE_DUMMY_AUTH=true
- DEVOPS_SECURE_STATUS=false
- - IBM_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
+ - OPENJ9_JAVA_OPTIONS=-XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=120s
swagger-ui:
image: docker.io/swaggerapi/swagger-ui:v3.20.5
diff --git a/deployment/kubernetes/ditto/ditto-cluster.yaml b/deployment/kubernetes/ditto/ditto-cluster.yaml
index 9bb845d736..d2bfbd0215 100644
--- a/deployment/kubernetes/ditto/ditto-cluster.yaml
+++ b/deployment/kubernetes/ditto/ditto-cluster.yaml
@@ -53,7 +53,7 @@ spec:
value: "kubernetes-api"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
---
apiVersion: extensions/v1beta1
@@ -110,7 +110,7 @@ spec:
value: "kubernetes-api"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
---
apiVersion: extensions/v1beta1
@@ -167,7 +167,7 @@ spec:
value: "kubernetes-api"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
---
apiVersion: extensions/v1beta1
@@ -223,7 +223,7 @@ spec:
value: "kubernetes-api"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
---
apiVersion: extensions/v1beta1
@@ -279,7 +279,7 @@ spec:
value: "kubernetes-api"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
---
apiVersion: extensions/v1beta1
@@ -337,7 +337,7 @@ spec:
value: "kubernetes-api"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
---
apiVersion: v1
diff --git a/deployment/openshift/ditto/ditto-cluster.yaml b/deployment/openshift/ditto/ditto-cluster.yaml
index 9b5a88c0de..45e19e00fe 100644
--- a/deployment/openshift/ditto/ditto-cluster.yaml
+++ b/deployment/openshift/ditto/ditto-cluster.yaml
@@ -64,7 +64,7 @@ spec:
value: "default"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-Xtune:virtualized -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
- name: MONGO_DB_URI
valueFrom:
@@ -137,7 +137,7 @@ spec:
value: "default"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-Xtune:virtualized -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
- name: MONGO_DB_URI
valueFrom:
@@ -210,7 +210,7 @@ spec:
value: "default"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-Xtune:virtualized -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
- name: MONGO_DB_URI
valueFrom:
@@ -282,7 +282,7 @@ spec:
value: "default"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-Xtune:virtualized -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
- name: MONGO_DB_URI
valueFrom:
@@ -354,7 +354,7 @@ spec:
value: "default"
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-Xtune:virtualized -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
- name: MONGO_DB_URI
valueFrom:
@@ -430,7 +430,7 @@ spec:
value: 0.0.0.0
- name: TZ
value: "Europe/Berlin"
- - name: IBM_JAVA_OPTIONS
+ - name: OPENJ9_JAVA_OPTIONS
value: "-Xtune:virtualized -XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError"
- name: DEVOPS_PASSWORD
value: "dittoPW1!"
diff --git a/services/pom.xml b/services/pom.xml
index e4377398b8..b7a0594fc7 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -48,7 +48,7 @@
docker.io
${docker.registry}/eclipse
- docker.io/adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u192-b12_openj9-0.11.0-slim
+ docker.io/adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u202-b08_openj9-0.12.1-slim
8080
ditto-policies
diff --git a/services/src/Dockerfile b/services/src/Dockerfile
index da4a9bf0a8..6cce3c2362 100644
--- a/services/src/Dockerfile
+++ b/services/src/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u192-b12_openj9-0.11.0-slim
+FROM adoptopenjdk/openjdk8-openj9:x86_64-alpine-jdk8u202-b08_openj9-0.12.1-slim
ARG MAVEN_REPO=https://repo.eclipse.org/content/repositories/ditto/org/eclipse/ditto/
ARG SERVICE_STARTER