Skip to content

Commit 5a822b6

Browse files
authored
fix(compose): Fix and modernise compose.yml (#345)
1 parent d143140 commit 5a822b6

File tree

1 file changed

+7
-47
lines changed

1 file changed

+7
-47
lines changed

docker-compose.yml

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,13 @@
1-
version: '2'
1+
version: '3.8'
22
services:
33
redis:
4-
image: redis:4.0.6
5-
#image: 'bitnami/redis:latest'
6-
#environment:
7-
# - ALLOW_EMPTY_PASSWORD=yes
8-
#volumes:
9-
# - ./tests/conf/redis.conf:/opt/bitnami/redis/mounted-etc/redis.conf
4+
image: redis:5.0.4
105
volumes:
11-
- ./tests/conf/redis.conf:/usr/local/etc/redis/redis.conf
6+
- ./tests/conf/redis.conf:/usr/local/etc/redis/redis.conf:Z
127
command: redis-server /usr/local/etc/redis/redis.conf
138
ports:
149
- "0.0.0.0:6379:6379"
1510

16-
#
17-
# Dev: Optionally enable to validate Redis Sentinel
18-
#
19-
# redis-sentinel:
20-
# image: 'bitnami/redis-sentinel:latest'
21-
# environment:
22-
# - REDIS_MASTER_HOST=redis
23-
# ports:
24-
# - '26379:26379'
25-
26-
# Kafka test will sometimes fail because Zookeeper won't start due to
27-
# java.io.IOException: Unable to create data directory /opt/zookeeper-3.4.9/data/version-2, which seems to be a known issue:
28-
# -> https://issues.apache.org/jira/browse/ZOOKEEPER-1936
29-
zookeeper:
30-
image: wurstmeister/zookeeper
31-
ports:
32-
- 2181:2181
33-
34-
kafka:
35-
image: wurstmeister/kafka:0.10.1.0-2
36-
ports:
37-
- 9092:9092
38-
depends_on:
39-
- "zookeeper"
40-
environment:
41-
KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1
42-
KAFKA_CREATE_TOPICS: test:1:1
43-
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
44-
volumes:
45-
- /var/run/docker.sock:/var/run/docker.sock
46-
- ./bin:/nodejs-collector-bin
47-
# command: ["/nodejs-collector-bin/wait-for-it.sh", "-s", "-t", "120", "zookeeper:2181", "--", "start-kafka.sh"]
48-
4911
cassandra:
5012
image: cassandra:3.11.5
5113
ports:
@@ -70,10 +32,10 @@ services:
7032
MYSQL_ROOT_PASSWORD: ''
7133
MYSQL_ROOT_HOST: '%'
7234
volumes:
73-
- ./tests/config/database/mysql/conf.d:/etc/mysql/conf.d
35+
- ./tests/config/database/mysql/conf.d/mysql.cnf:/etc/mysql/conf.d/mysql.cnf:Z
7436

7537
mongodb:
76-
image: 'mongo:3.4.1'
38+
image: 'mongo:4.2.3'
7739
ports:
7840
- '27017:27017'
7941

@@ -88,18 +50,16 @@ services:
8850

8951
rabbitmq:
9052
image: rabbitmq:3.7.8-alpine
53+
environment:
54+
- RABBITMQ_NODENAME=rabbit@localhost
9155
ports:
9256
- 5671:5671
9357
- 5672:5672
9458

95-
# pubsub testing
9659
pubsub:
9760
image: singularities/pubsub-emulator
9861
environment:
9962
- PUBSUB_PROJECT_ID=project-test
10063
- PUBSUB_LISTEN_ADDRESS=0.0.0.0:8432
10164
ports:
10265
- "8432:8432"
103-
104-
#volumes:
105-
# mysql-data:

0 commit comments

Comments
 (0)