Skip to content

Commit b346637

Browse files
move variables to env file
ISSUE: CLDSRVCLT-5
1 parent cf7f862 commit b346637

File tree

3 files changed

+76
-49
lines changed

3 files changed

+76
-49
lines changed

.github/docker-compose.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ services:
33
# MongoDB
44
# ===================
55
mongodb:
6-
image: mongo:4.4
7-
command: mongod --replSet rs0 --port 27018 --bind_ip_all
6+
image: ${MONGODB_IMAGE}
7+
command: mongod --replSet rs0 --port ${MONGODB_PORT} --bind_ip_all
88
ports:
9-
- "127.0.0.1:27018:27018"
9+
- "127.0.0.1:${MONGODB_PORT}:${MONGODB_PORT}"
1010
healthcheck:
11-
test: echo 'db.runCommand("ping").ok' | mongo --port 27018 --quiet
11+
test: echo 'db.runCommand("ping").ok' | mongo --port ${MONGODB_PORT} --quiet
1212
interval: 5s
1313
timeout: 10s
1414
retries: 5
@@ -18,13 +18,13 @@ services:
1818
- backbeat
1919

2020
mongodb-init:
21-
image: mongo:4.4
21+
image: ${MONGODB_IMAGE}
2222
depends_on:
2323
mongodb:
2424
condition: service_healthy
2525
command: >
26-
mongo --host mongodb:27018 --eval
27-
'rs.initiate({_id: "rs0", members: [{_id: 0, host: "mongodb:27018"}]})'
26+
mongo --host mongodb:${MONGODB_PORT} --eval
27+
'rs.initiate({_id: "rs0", members: [{_id: 0, host: "mongodb:${MONGODB_PORT}"}]})'
2828
restart: "no"
2929
profiles:
3030
- mongo
@@ -34,24 +34,24 @@ services:
3434
# Cloudserver with MongoDB backend
3535
# ===================
3636
cloudserver:
37-
image: ghcr.io/scality/cloudserver:9.3.0-preview.1
37+
image: ${CLOUDSERVER_IMAGE}
3838
ports:
39-
- "127.0.0.1:8000:8000"
39+
- "127.0.0.1:${CLOUDSERVER_PORT}:${CLOUDSERVER_PORT}"
4040
environment:
4141
- S3VAULT=mem
4242
- S3METADATA=mongodb
4343
- S3DATA=mem
44-
- MONGODB_HOSTS=mongodb:27018
44+
- MONGODB_HOSTS=mongodb:${MONGODB_PORT}
4545
- MONGODB_RS=rs0
4646
- REMOTE_MANAGEMENT_DISABLE=true
4747
- LOG_LEVEL=info
4848
- CRR_METRICS_HOST=backbeat-api
49-
- CRR_METRICS_PORT=8900
49+
- CRR_METRICS_PORT=${BACKBEAT_PORT}
5050
depends_on:
5151
mongodb-init:
5252
condition: service_completed_successfully
5353
healthcheck:
54-
test: ["CMD-SHELL", "node -e \"require('http').get('http://localhost:8000/', r => process.exit(r.statusCode < 500 ? 0 : 1)).on('error', () => process.exit(1))\""]
54+
test: ["CMD-SHELL", "node -e \"require('http').get('http://localhost:${CLOUDSERVER_PORT}/', r => process.exit(r.statusCode < 500 ? 0 : 1)).on('error', () => process.exit(1))\""]
5555
interval: 5s
5656
timeout: 5s
5757
retries: 12
@@ -63,15 +63,15 @@ services:
6363
# Metadata backend services
6464
# ===================
6565
metadata-standalone:
66-
image: ghcr.io/scality/metadata:8.11.0-standalone
66+
image: ${METADATA_IMAGE}
6767
network_mode: 'host'
6868
volumes:
6969
- ./md-config.json:/mnt/standalone_workdir/config.json:ro
7070
profiles:
7171
- metadata
7272

7373
cloudserver-metadata:
74-
image: ghcr.io/scality/cloudserver:9.3.0-preview.1
74+
image: ${CLOUDSERVER_IMAGE}
7575
network_mode: 'host'
7676
environment:
7777
- S3VAULT=mem
@@ -82,7 +82,7 @@ services:
8282
depends_on:
8383
- metadata-standalone
8484
healthcheck:
85-
test: ["CMD-SHELL", "node -e \"require('http').get('http://localhost:8000/', r => process.exit(r.statusCode < 500 ? 0 : 1)).on('error', () => process.exit(1))\""]
85+
test: ["CMD-SHELL", "node -e \"require('http').get('http://localhost:${CLOUDSERVER_PORT}/', r => process.exit(r.statusCode < 500 ? 0 : 1)).on('error', () => process.exit(1))\""]
8686
interval: 5s
8787
timeout: 5s
8888
retries: 12
@@ -93,9 +93,9 @@ services:
9393
# Backbeat services
9494
# ===================
9595
zookeeper:
96-
image: zookeeper:3.8
96+
image: ${ZOOKEEPER_IMAGE}
9797
ports:
98-
- "127.0.0.1:2181:2181"
98+
- "127.0.0.1:${ZOOKEEPER_PORT}:${ZOOKEEPER_PORT}"
9999
healthcheck:
100100
test: ["CMD", "zkServer.sh", "status"]
101101
interval: 10s
@@ -105,46 +105,46 @@ services:
105105
- backbeat
106106

107107
zk-init:
108-
image: zookeeper:3.8
108+
image: ${ZOOKEEPER_IMAGE}
109109
depends_on:
110110
zookeeper:
111111
condition: service_healthy
112112
command: >
113113
bash -c "
114114
sleep 2 &&
115-
zkCli.sh -server zookeeper:2181 create /backbeat '' &&
116-
zkCli.sh -server zookeeper:2181 create /backbeat/replication '' &&
117-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state '' &&
118-
zkCli.sh -server zookeeper:2181 create /backbeat/ingestion '' &&
119-
zkCli.sh -server zookeeper:2181 create /backbeat/ingestion/state '' &&
120-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state/us-east-1 '{\"paused\":false}' &&
121-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state/us-east-2 '{\"paused\":false}' &&
122-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state/wontwork-location '{\"paused\":false}' &&
123-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state/location-dmf-v1 '{\"paused\":false}' &&
124-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state/zenko '{\"paused\":false}' &&
125-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/state/aws-location '{\"paused\":false}' &&
126-
zkCli.sh -server zookeeper:2181 create /backbeat/replication/replayState '' &&
115+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat '' &&
116+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication '' &&
117+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state '' &&
118+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/ingestion '' &&
119+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/ingestion/state '' &&
120+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state/us-east-1 '{\"paused\":false}' &&
121+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state/us-east-2 '{\"paused\":false}' &&
122+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state/wontwork-location '{\"paused\":false}' &&
123+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state/location-dmf-v1 '{\"paused\":false}' &&
124+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state/zenko '{\"paused\":false}' &&
125+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/state/aws-location '{\"paused\":false}' &&
126+
zkCli.sh -server zookeeper:${ZOOKEEPER_PORT} create /backbeat/replication/replayState '' &&
127127
echo 'Zookeeper paths initialized successfully'
128128
"
129129
restart: "no"
130130
profiles:
131131
- backbeat
132132

133133
redis:
134-
image: redis:7-alpine
134+
image: ${REDIS_IMAGE}
135135
ports:
136-
- "127.0.0.1:6379:6379"
136+
- "127.0.0.1:${REDIS_PORT}:${REDIS_PORT}"
137137
profiles:
138138
- backbeat
139139

140140
kafka:
141-
image: wurstmeister/kafka:latest
141+
image: ${KAFKA_IMAGE}
142142
ports:
143-
- "127.0.0.1:9092:9092"
143+
- "127.0.0.1:${KAFKA_PORT}:${KAFKA_PORT}"
144144
environment:
145-
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
146-
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
147-
KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
145+
KAFKA_ZOOKEEPER_CONNECT: zookeeper:${ZOOKEEPER_PORT}
146+
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:${KAFKA_PORT}
147+
KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:${KAFKA_PORT}
148148
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
149149
depends_on:
150150
zookeeper:
@@ -153,14 +153,14 @@ services:
153153
- backbeat
154154

155155
backbeat-api:
156-
image: ghcr.io/scality/backbeat:9.1.3
156+
image: ${BACKBEAT_IMAGE}
157157
ports:
158-
- "127.0.0.1:8900:8900"
158+
- "127.0.0.1:${BACKBEAT_PORT}:${BACKBEAT_PORT}"
159159
environment:
160-
ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
160+
ZOOKEEPER_CONNECTION_STRING: zookeeper:${ZOOKEEPER_PORT}
161161
REDIS_HOST: redis
162-
KAFKA_HOSTS: kafka:9092
163-
MONGODB_HOSTS: mongodb:27018
162+
KAFKA_HOSTS: kafka:${KAFKA_PORT}
163+
MONGODB_HOSTS: mongodb:${MONGODB_PORT}
164164
REMOTE_MANAGEMENT_DISABLE: "1"
165165
HEALTHCHECKS_ALLOWFROM: "0.0.0.0/0"
166166
depends_on:
@@ -173,7 +173,7 @@ services:
173173
redis:
174174
condition: service_started
175175
healthcheck:
176-
test: ["CMD-SHELL", "node -e \"require('http').get('http://localhost:8900/_/healthcheck', r => process.exit(r.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))\""]
176+
test: ["CMD-SHELL", "node -e \"require('http').get('http://localhost:${BACKBEAT_PORT}/_/healthcheck', r => process.exit(r.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))\""]
177177
interval: 5s
178178
timeout: 5s
179179
retries: 12

.github/docker.env

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# MongoDB
2+
MONGODB_IMAGE=mongo:4.4
3+
MONGODB_PORT=27018
4+
5+
# Cloudserver
6+
CLOUDSERVER_IMAGE=ghcr.io/scality/cloudserver:9.3.0-preview.1
7+
CLOUDSERVER_PORT=8000
8+
9+
# Metadata
10+
METADATA_IMAGE=ghcr.io/scality/metadata:8.11.0-standalone
11+
METADATA_PORT=9000
12+
13+
# Zookeeper
14+
ZOOKEEPER_IMAGE=zookeeper:3.8
15+
ZOOKEEPER_PORT=2181
16+
17+
# Kafka
18+
KAFKA_IMAGE=wurstmeister/kafka:latest
19+
KAFKA_PORT=9092
20+
21+
# Redis
22+
REDIS_IMAGE=redis:7-alpine
23+
REDIS_PORT=6379
24+
25+
# Backbeat
26+
BACKBEAT_IMAGE=ghcr.io/scality/backbeat:9.1.3
27+
BACKBEAT_PORT=8900

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
uses: ./.github/actions/setup-and-build
4141

4242
- name: Start Cloudserver with MongoDB backend
43-
run: docker compose -f .github/docker-compose.yml --profile mongo up -d --wait
43+
run: docker compose -f .github/docker-compose.yml --env-file .github/docker.env --profile mongo up -d --wait
4444

4545
- name: Run MongoDB backend tests
4646
run: yarn test:mongo-backend
4747

4848
- name: Stop Cloudserver
4949
if: always()
50-
run: docker compose -f .github/docker-compose.yml --profile mongo down
50+
run: docker compose -f .github/docker-compose.yml --env-file .github/docker.env --profile mongo down
5151

5252
test-metadata-backend:
5353
name: Test with Scality metadata backend
@@ -69,7 +69,7 @@ jobs:
6969
password: ${{ github.token }}
7070

7171
- name: Start Cloudserver with Scality metadata backend
72-
run: docker compose -f .github/docker-compose.yml --profile metadata up -d --wait
72+
run: docker compose -f .github/docker-compose.yml --env-file .github/docker.env --profile metadata up -d --wait
7373

7474
- name: Wait for metadata to be ready
7575
run: |
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Stop Cloudserver
8383
if: always()
84-
run: docker compose -f .github/docker-compose.yml --profile metadata down
84+
run: docker compose -f .github/docker-compose.yml --env-file .github/docker.env --profile metadata down
8585

8686
test-backbeat-apis:
8787
name: Test backbeat apis
@@ -103,11 +103,11 @@ jobs:
103103
password: ${{ github.token }}
104104

105105
- name: Start Backbeat with CloudServer
106-
run: docker compose -f .github/docker-compose.yml --profile backbeat up -d --wait
106+
run: docker compose -f .github/docker-compose.yml --env-file .github/docker.env --profile backbeat up -d --wait
107107

108108
- name: Run backbeat apis tests
109109
run: yarn test:backbeat-apis
110110

111111
- name: Stop Backbeat and Cloudserver
112112
if: always()
113-
run: docker compose -f .github/docker-compose.yml --profile backbeat down
113+
run: docker compose -f .github/docker-compose.yml --env-file .github/docker.env --profile backbeat down

0 commit comments

Comments
 (0)