fixed remaining mentions of "java -jar" usage to start containers

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Sep 28, 2022 · fb29be2 · fb29be2
1 parent 85f70c8
commit fb29be2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 37 deletions.
diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
@@ -37,14 +37,12 @@ services:
     environment:
       - TZ=Europe/Berlin
       - BIND_HOSTNAME=0.0.0.0
+      # Set additional configuration options here appending JAVA_TOOL_OPTIONS: -Dditto.policies...
       - JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=180s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=20s -Dakka.cluster.downing-provider-class=
       - MONGO_DB_HOSTNAME=mongodb
       # in order to write logs into a file you can enable this by setting the following env variable
       # the log file(s) can be found in /var/log/ditto directory on the host machine
       # - DITTO_LOGGING_FILE_APPENDER=true
-    # Set additional configuration options here
-    # -Dditto.policies...
-    #command: java -jar starter.jar
     # only needed if DITTO_LOGGING_FILE_APPENDER is set
     # volumes:
     #  - ditto_log_files:/var/log/ditto
@@ -68,14 +66,12 @@ services:
     environment:
       - TZ=Europe/Berlin
       - BIND_HOSTNAME=0.0.0.0
+      # Set additional configuration options here appending JAVA_TOOL_OPTIONS: -Dditto.things...
       - JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=180s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=20s -Dakka.cluster.downing-provider-class=
       - MONGO_DB_HOSTNAME=mongodb
       # in order to write logs into a file you can enable this by setting the following env variable
       # the log file(s) can be found in /var/log/ditto directory on the host machine
       # - DITTO_LOGGING_FILE_APPENDER=true
-    # Set additional configuration options here
-    # -Dditto.things...
-    #command: java -jar starter.jar
     # only needed if DITTO_LOGGING_FILE_APPENDER is set
     # volumes:
     #  - ditto_log_files:/var/log/ditto
@@ -99,14 +95,12 @@ services:
     environment:
       - TZ=Europe/Berlin
       - BIND_HOSTNAME=0.0.0.0
+      # Set additional configuration options here appending JAVA_TOOL_OPTIONS: -Dditto.search...
       - JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=180s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=20s -Dakka.cluster.downing-provider-class=
       - MONGO_DB_HOSTNAME=mongodb
       # in order to write logs into a file you can enable this by setting the following env variable
       # the log file(s) can be found in /var/log/ditto directory on the host machine
       # - DITTO_LOGGING_FILE_APPENDER=true
-    # Set additional configuration options here
-    # -Dditto.search...
-    #command: java -jar starter.jar
     # only needed if DITTO_LOGGING_FILE_APPENDER is set
     # volumes:
     #  - ditto_log_files:/var/log/ditto
@@ -131,14 +125,12 @@ services:
       - TZ=Europe/Berlin
       - BIND_HOSTNAME=0.0.0.0
       # if connections to rabbitmq broker are used, you might want to disable ExitOnOutOfMemoryError, because the amqp-client has a bug throwing OOM exceptions and causing a restart loop
+      # Set additional configuration options here appending JAVA_TOOL_OPTIONS: -Dditto.connectivity...
       - JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=180s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=20s -Dakka.cluster.downing-provider-class=
       - MONGO_DB_HOSTNAME=mongodb
       # in order to write logs into a file you can enable this by setting the following env variable
       # the log file(s) can be found in /var/log/ditto directory on the host machine
       # - DITTO_LOGGING_FILE_APPENDER=true
-    # Set additional configuration options here
-    # -Dditto.connectivity...
-    #command: java -jar starter.jar
     # only needed if DITTO_LOGGING_FILE_APPENDER is set
     #volumes:
     #  - ditto_log_files:/var/log/ditto
@@ -165,16 +157,13 @@ services:
       - TZ=Europe/Berlin
       - BIND_HOSTNAME=0.0.0.0
       - ENABLE_PRE_AUTHENTICATION=true
+      # Set additional configuration options here appending JAVA_TOOL_OPTIONS: -Dditto.gateway.authentication.devops.password=foobar -Dditto.gateway...
       - JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=180s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=20s -Dakka.cluster.downing-provider-class=
       # in order to write logs into a file you can enable this by setting the following env variable
       # the log file(s) can be found in /var/log/ditto directory on the host machine
       # - DITTO_LOGGING_FILE_APPENDER=true
       # You may use the environment for setting the devops password
       #- DEVOPS_PASSWORD=foobar
-    # Set additional configuration options here
-    # -Dditto.gateway...
-    # Setting the devops password via java VM environment
-    #command: java -Dditto.gateway.authentication.devops.password=foobar -jar starter.jar
     # only needed if DITTO_LOGGING_FILE_APPENDER is set
     # volumes:
     #  - ditto_log_files:/var/log/ditto

diff --git a/deployment/openshift/ditto/ditto-cluster.yaml b/deployment/openshift/ditto/ditto-cluster.yaml
@@ -24,10 +24,6 @@ spec:
       - name: connectivity
         image: docker.io/eclipse/ditto-connectivity:latest
         imagePullPolicy: IfNotPresent
-        args:
-          - "java"
-          - "-jar"
-          - "/opt/ditto/starter.jar"
         ports:
         - name: remoting
           containerPort: 2551
@@ -101,10 +97,6 @@ spec:
       - name: things
         image: docker.io/eclipse/ditto-things:latest
         imagePullPolicy: IfNotPresent
-        args:
-          - "java"
-          - "-jar"
-          - "/opt/ditto/starter.jar"
         ports:
         - name: remoting
           containerPort: 2551
@@ -177,10 +169,6 @@ spec:
       - name: things-search
         image: docker.io/eclipse/ditto-things-search:latest
         imagePullPolicy: IfNotPresent
-        args:
-          - "java"
-          - "-jar"
-          - "/opt/ditto/starter.jar"
         ports:
         - name: remoting
           containerPort: 2551
@@ -252,10 +240,6 @@ spec:
       - name: policies
         image: docker.io/eclipse//eclipse-ditto-policies:latest
         imagePullPolicy: IfNotPresent
-        args:
-          - "java"
-          - "-jar"
-          - "/opt/ditto/starter.jar"
         ports:
         - name: remoting
           containerPort: 2551
@@ -328,10 +312,6 @@ spec:
       - name: gateway
         image: docker.io/eclipse/ditto-gateway:latest
         imagePullPolicy: IfNotPresent
-        args:
-          - "java"
-          - "-jar"
-          - "/opt/ditto/starter.jar"
         ports:
         - name: remoting
           containerPort: 2551

diff --git a/documentation/src/main/resources/pages/ditto/installation-operating.md b/documentation/src/main/resources/pages/ditto/installation-operating.md
@@ -54,7 +54,8 @@ to supply additional configuration one has to add the variable in the correspond
 ```yml
 ...
 # Alternative approach for configuration of the service
-command: java -Dditto.gateway.authentication.devops.password=foobar -jar starter.jar
+environment:
+  - JAVA_TOOL_OPTIONS=-Dditto.gateway.authentication.devops.password=foobar
 ```
 
 The executable for the microservice is called `starter.jar`. The configuration variables have to be set before