Skip to content

Commit 926f109

Browse files
tobiasaketobiasake
authored
Added new components to docker-compose for system tests. (#204)
1 parent bc735ae commit 926f109

File tree

3 files changed

+113
-14
lines changed

3 files changed

+113
-14
lines changed

‎docker-compose.yml

Lines changed: 100 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
##################################################################################################
3232
version: "2.1"
3333
services:
34-
mymongodb-mongodb:
34+
mongodb:
3535
restart: always
3636
image: mongo:latest
3737
expose:
3838
- "27017"
3939
ports:
40-
- "27017:27017"
40+
- "${MONGODB_PORT}:27017"
4141
healthcheck:
4242
test: ["CMD-SHELL","echo", "'db.stats().ok' | mongo localhost:27017/test", "--quiet"]
4343
interval: 30s
@@ -46,17 +46,17 @@ services:
4646
networks:
4747
eiffel_2.0_1:
4848
aliases:
49-
- mymongodb-mongodb:27017
49+
- mongodb
5050

51-
myrabbitmq-rabbitmq:
51+
rabbitmq:
5252
restart: always
5353
image: rabbitmq:3.6.2-management
5454
expose:
5555
- "15672"
5656
- "5672"
5757
ports:
58-
- "15672:15672"
59-
- "5672:5672"
58+
- "${RABBITMQ_WEB_PORT}:15672"
59+
- "${RABBITMQ_AMQP_PORT}:5672"
6060
healthcheck:
6161
test: ["CMD-SHELL", "if rabbitmqctl status; then \nexit 0 \nfi \nexit 1"]
6262
interval: 30s
@@ -65,12 +65,104 @@ services:
6565
networks:
6666
eiffel_2.0_1:
6767
aliases:
68-
- myrabbitmq-rabbitmq:5672
69-
- myrabbitmq-rabbitmq:15672
68+
- rabbitmq
7069
environment:
7170
- RABBITMQ_DEFAULT_PASS=myuser
7271
- RABBITMQ_DEFAULT_USER=myuser
7372
- RABBITMQ_DEFAULT_VHOST=/
7473

74+
eiffel-er:
75+
restart: always
76+
image: eiffelericsson/eiffel-er:0.0.60
77+
expose:
78+
- "8080"
79+
ports:
80+
- "${EIFFEL_ER_PORT}:8080"
81+
depends_on:
82+
- rabbitmq
83+
- mongodb
84+
networks:
85+
eiffel_2.0_1:
86+
aliases:
87+
- eiffel-er
88+
environment: # Overrides settings in config file in catalina folder. OBS --> skip quotes for rabbitmq.bindingKey value
89+
# No config file copied to catalina folder in Dockerfile, only uses env vars below ;-)
90+
# /eventrepository removed in contextpath
91+
- server.contextPath=/
92+
- server.port=8080
93+
- rabbitmq.host=rabbitmq
94+
- rabbitmq.componentName=eventrepository
95+
- rabbitmq.port=5672
96+
- rabbitmq.domainId=ei-domain
97+
- rabbitmq.durable=true
98+
- rabbitmq.user=myuser
99+
- rabbitmq.password=myuser
100+
- rabbitmq.exchangeName=ei-exchange
101+
- rabbitmq.bindingKey=#
102+
- rabbitmq.autoDelete=false
103+
- rabbitmq.createExchangeIfNotExisting=true
104+
- rabbitmq.consumerName=messageConsumer
105+
- mongodb.host=mongodb
106+
- mongodb.port=27017
107+
- mongodb.database=eiffel
108+
- mongodb.collection=events
109+
- mongodb.user
110+
- mongodb.password
111+
- mongodb.indexes=meta.id,links.target,links.type,meta.time,data.gav.groupId,data.gav.artifactId
112+
- mongodb.externalERs
113+
- search.limit=100
114+
- search.levels=10
115+
- eventrepo2.URL=https://eiffel.lmera.ericsson.se/com.ericsson.duraci/eiffel-erri/index.html
116+
- index.staticIndex.indexOn=false
117+
- index.staticIndex.filePath=src/main/resources/static_indexes.json
118+
- index.dynamicIndex.indexOn=false
119+
- index.dynamicIndex.indexCreationDay=SUNDAY
120+
- index.dynamicIndex.indexCreationTime=11:50:00
121+
- index.dynamicIndex.maxIndexesCount=5
122+
- index.dynamicIndex.filePath=src/main/resources/dynamic_indexing.json
123+
- index.dynamicIndex.fileUpdatePeriod=30
124+
125+
jenkins:
126+
restart: always
127+
image: bitnami/jenkins:2.138.3
128+
expose:
129+
- "8080"
130+
ports:
131+
- "${JENKINS_PORT}:8080"
132+
depends_on:
133+
- rabbitmq
134+
- mongodb
135+
environment:
136+
- JENKINS_USERNAME=admin
137+
- JENKINS_PASSWORD=admin
138+
# - JENKINS_HOME= # JENKINS_HOME: Jenkins home directory. Default: /opt/bitnami/jenkins/jenkins_home
139+
# - DISABLE_JENKINS_INITIALIZATION= # DISABLE_JENKINS_INITIALIZATION: Allows to disable the initial Bitnami configuration for Jenkins. Default: no
140+
# - JAVA_OPTS= # JAVA_OPTS: Customize JVM parameters. No defaults.
141+
142+
networks:
143+
eiffel_2.0_1:
144+
aliases:
145+
- jenkins
146+
147+
mail-server:
148+
image: mailhog/mailhog
149+
expose:
150+
- "1025"
151+
- "8025"
152+
ports:
153+
- "${MAIL_SMTP_PORT}:1025"
154+
- "${MAIL_WEB_PORT}:8025"
155+
depends_on:
156+
- mongodb
157+
environment:
158+
MH_STORAGE: mongodb
159+
MH_MONGO_URI: mongodb:27017
160+
MH_MONGO_COLLECTION: messages
161+
MH_MONGO_DB: mailhog
162+
networks:
163+
eiffel_2.0_1:
164+
aliases:
165+
- mail-server
166+
75167
networks:
76168
eiffel_2.0_1:

‎docker-env.bash

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export MONGODB_PORT=27017
2+
export RABBITMQ_AMQP_PORT=5672
3+
export RABBITMQ_WEB_PORT=15672
4+
export EIFFEL_ER_PORT=8084
5+
export JENKINS_PORT=8081
6+
export MAIL_SMTP_PORT=1025
7+
export MAIL_WEB_PORT=8025

‎src/main/resources/application.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ logging.level.com.ericsson.ei: ERROR
2222
# Details for connection to RabbitMQ
2323
rabbitmq.host: localhost
2424
rabbitmq.port: 5672
25-
rabbitmq.user:
26-
rabbitmq.password:
25+
rabbitmq.user: myuser
26+
rabbitmq.password: myuser
2727
# Valid TLS versions: 'TLSv1.2', 'TLSv1.1', 'TLSv1', 'TLS', 'SSLv3', 'SSLv2', 'SSL'
2828
rabbitmq.tlsVersion:
29-
rabbitmq.exchange.name: ei-poc-4
30-
rabbitmq.domainId: er001-eiffelxxx
31-
rabbitmq.componentName: eiffelintelligence
29+
rabbitmq.exchange.name: ei-exchange
30+
rabbitmq.domainId: ei-domain
31+
rabbitmq.componentName: eiffel-intelligence
3232
rabbitmq.consumerName: messageConsumer
3333
rabbitmq.queue.durable:true
3434
rabbitmq.binding.key:#
@@ -128,4 +128,4 @@ ldap.username:
128128
# password should be encoded. It will be decoded in EndpointSecurity.java.
129129
# Password needs to be encoded with base64.
130130
ldap.password:
131-
ldap.user.filter:
131+
ldap.user.filter:

0 commit comments

Comments
 (0)