Skip to content

Commit fe82aba

Browse files
thjaecklethjaeckle
authored
Merge pull request #207 from bsinno/doc/milestone-080M1
Prepare milestone 0.8.0-M1
2 parents b43dbae + aec34de commit fe82aba

File tree

23 files changed

+257
-1600
lines changed

23 files changed

+257
-1600
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Find the documentation on the project site: [https://eclipse.org/ditto/](https:/
1919
## Getting started
2020

2121
In order to start up Ditto, you'll need
22-
* a running Docker daemon (at least version 17.06 CE)
23-
* Docker Compose installed (at least version 1.14)
22+
* a running Docker daemon (at least version 18.06 CE)
23+
* Docker Compose installed (at least version 1.22)
2424

2525
### Start Ditto
2626

‎docker/dev.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DITTO_VERSION=0.1.0-SNAPSHOT
1+
DITTO_VERSION=0-SNAPSHOT

‎docker/docker-compose.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.0'
1+
version: '3.7'
22

33
services:
44
mongodb:
@@ -13,6 +13,7 @@ services:
1313
TZ: Europe/Berlin
1414

1515
policies:
16+
init: true
1617
image: docker.io/eclipse/ditto-policies:${DITTO_VERSION:-latest}
1718
networks:
1819
default:
@@ -22,10 +23,10 @@ services:
2223
- TZ=Europe/Berlin
2324
- INSTANCE_INDEX=1
2425
- BIND_HOSTNAME=0.0.0.0
25-
- _JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Dditto.cluster.become-leader=true
26-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Dditto.cluster.become-leader=true
26+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError
2727

2828
things:
29+
init: true
2930
image: docker.io/eclipse/ditto-things:${DITTO_VERSION:-latest}
3031
networks:
3132
default:
@@ -37,10 +38,10 @@ services:
3738
- TZ=Europe/Berlin
3839
- INSTANCE_INDEX=1
3940
- BIND_HOSTNAME=0.0.0.0
40-
- _JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
41-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
41+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError
4242

4343
things-search:
44+
init: true
4445
image: docker.io/eclipse/ditto-things-search:${DITTO_VERSION:-latest}
4546
networks:
4647
default:
@@ -52,10 +53,10 @@ services:
5253
- TZ=Europe/Berlin
5354
- INSTANCE_INDEX=1
5455
- BIND_HOSTNAME=0.0.0.0
55-
- _JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
56-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
56+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError
5757

5858
concierge:
59+
init: true
5960
image: docker.io/eclipse/ditto-concierge:${DITTO_VERSION:-latest}
6061
networks:
6162
default:
@@ -67,10 +68,10 @@ services:
6768
- TZ=Europe/Berlin
6869
- INSTANCE_INDEX=1
6970
- BIND_HOSTNAME=0.0.0.0
70-
- _JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
71-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
71+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError
7272

7373
connectivity:
74+
init: true
7475
image: docker.io/eclipse/ditto-connectivity:${DITTO_VERSION:-latest}
7576
networks:
7677
default:
@@ -83,10 +84,10 @@ services:
8384
- TZ=Europe/Berlin
8485
- INSTANCE_INDEX=1
8586
- BIND_HOSTNAME=0.0.0.0
86-
- _JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
87-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
87+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError
8888

8989
gateway:
90+
init: true
9091
image: docker.io/eclipse/ditto-gateway:${DITTO_VERSION:-latest}
9192
networks:
9293
default:
@@ -102,8 +103,7 @@ services:
102103
- INSTANCE_INDEX=1
103104
- BIND_HOSTNAME=0.0.0.0
104105
- ENABLE_DUMMY_AUTH=true
105-
- _JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
106-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError
106+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError
107107

108108
swagger-ui:
109109
image: docker.io/swaggerapi/swagger-ui:v2.2.9

‎docker/sandbox/docker-compose.yml

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.2'
1+
version: '3.7'
22

33
services:
44
mongodb:
@@ -14,6 +14,7 @@ services:
1414
TZ: Europe/Berlin
1515

1616
policies:
17+
init: true
1718
image: docker.io/eclipse/ditto-policies:${DITTO_VERSION:-latest}
1819
networks:
1920
default:
@@ -23,9 +24,10 @@ services:
2324
- TZ=Europe/Berlin
2425
- INSTANCE_INDEX=1
2526
- BIND_HOSTNAME=0.0.0.0
26-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Xtune:virtualized -Dditto.cluster.become-leader=true
27+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
2728

2829
things:
30+
init: true
2931
image: docker.io/eclipse/ditto-things:${DITTO_VERSION:-latest}
3032
networks:
3133
default:
@@ -37,9 +39,10 @@ services:
3739
- TZ=Europe/Berlin
3840
- INSTANCE_INDEX=1
3941
- BIND_HOSTNAME=0.0.0.0
40-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
42+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
4143

4244
things-search:
45+
init: true
4346
image: docker.io/eclipse/ditto-things-search:${DITTO_VERSION:-latest}
4447
networks:
4548
default:
@@ -51,9 +54,10 @@ services:
5154
- TZ=Europe/Berlin
5255
- INSTANCE_INDEX=1
5356
- BIND_HOSTNAME=0.0.0.0
54-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
57+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
5558

5659
concierge:
60+
init: true
5761
image: docker.io/eclipse/ditto-concierge:${DITTO_VERSION:-latest}
5862
networks:
5963
default:
@@ -65,9 +69,10 @@ services:
6569
- TZ=Europe/Berlin
6670
- INSTANCE_INDEX=1
6771
- BIND_HOSTNAME=0.0.0.0
68-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
72+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
6973

7074
connectivity:
75+
init: true
7176
image: docker.io/eclipse/ditto-connectivity:${DITTO_VERSION:-latest}
7277
networks:
7378
default:
@@ -80,9 +85,10 @@ services:
8085
- TZ=Europe/Berlin
8186
- INSTANCE_INDEX=1
8287
- BIND_HOSTNAME=0.0.0.0
83-
- IBM_JAVA_OPTIONS=-Xms256m -Xmx256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
88+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
8489

8590
gateway:
91+
init: true
8692
image: docker.io/eclipse/ditto-gateway:${DITTO_VERSION:-latest}
8793
networks:
8894
default:
@@ -97,7 +103,7 @@ services:
97103
- BIND_HOSTNAME=0.0.0.0
98104
- ENABLE_DUMMY_AUTH=true
99105
- DEVOPS_SECURE_STATUS=false
100-
- IBM_JAVA_OPTIONS=-Xms256m -Xms256m -Xss512k -XX:MaxMetaspaceSize=128m -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
106+
- IBM_JAVA_OPTIONS=-XX:MaxRAMPercentage=80 -XX:InitialRAMPercentage=40 -XX:+ExitOnOutOfMemoryError -Xtune:virtualized
101107

102108
swagger-ui:
103109
image: docker.io/swaggerapi/swagger-ui:v2.2.9

0 commit comments

Comments
 (0)