Skip to content

Commit 76689cd

Browse files
jpetazzojpetazzo
committed
Updates for CRAFT (bring everything to Compose v2)
1 parent 7448474 commit 76689cd

9 files changed

+449
-583
lines changed

Diff for: ‎dockercoins/docker-compose.yml

+21-24
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1-
rng:
2-
build: rng
3-
ports:
4-
- "8001:80"
1+
version: "2"
52

6-
hasher:
7-
build: hasher
8-
ports:
9-
- "8002:80"
3+
services:
4+
rng:
5+
build: rng
6+
ports:
7+
- "8001:80"
108

11-
webui:
12-
build: webui
13-
links:
14-
- redis
15-
ports:
16-
- "8000:80"
17-
volumes:
18-
- "./webui/files/:/files/"
9+
hasher:
10+
build: hasher
11+
ports:
12+
- "8002:80"
1913

20-
redis:
21-
image: redis
14+
webui:
15+
build: webui
16+
ports:
17+
- "8000:80"
18+
volumes:
19+
- "./webui/files/:/files/"
2220

23-
worker:
24-
build: worker
25-
links:
26-
- rng
27-
- hasher
28-
- redis
21+
redis:
22+
image: redis
23+
24+
worker:
25+
build: worker
2926

Diff for: ‎dockercoins/docker-compose.yml-ambassador

+34-43
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,35 @@
1-
rng1:
2-
build: rng
3-
4-
rng2:
5-
build: rng
6-
7-
rng3:
8-
build: rng
9-
10-
rng:
11-
image: jpetazzo/hamba
12-
links:
13-
- rng1
14-
- rng2
15-
- rng3
16-
command: 80 rng1 80 rng2 80 rng3 80
17-
ports:
18-
- "8001:80"
19-
20-
hasher:
21-
build: hasher
22-
ports:
23-
- "8002:80"
24-
25-
webui:
26-
build: webui
27-
links:
28-
- redis
29-
ports:
30-
- "8000:80"
31-
volumes:
32-
- "./webui/files/:/files/"
33-
34-
redis:
35-
image: jpetazzo/hamba
36-
command: 6379 AA.BB.CC.DD EEEEE
37-
38-
worker:
39-
build: worker
40-
links:
41-
- rng
42-
- hasher
43-
- redis
1+
version: "2"
2+
3+
services:
4+
rng1:
5+
build: rng
6+
rng2:
7+
build: rng
8+
rng3:
9+
build: rng
10+
11+
rng:
12+
image: jpetazzo/hamba
13+
command: 80 rng1:80 rng2:80 rng3:80
14+
ports:
15+
- "8001:80"
16+
17+
hasher:
18+
build: hasher
19+
ports:
20+
- "8002:80"
21+
22+
webui:
23+
build: webui
24+
ports:
25+
- "8000:80"
26+
volumes:
27+
- "./webui/files/:/files/"
28+
29+
redis:
30+
image: jpetazzo/hamba
31+
command: 6379 AA.BB.CC.DD:EEEEE
32+
33+
worker:
34+
build: worker
4435

Diff for: ‎dockercoins/docker-compose.yml-extra-hosts

-43
This file was deleted.

Diff for: ‎dockercoins/docker-compose.yml-logging

+42-39
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
1-
rng:
2-
build: rng
3-
ports:
4-
- "8001:80"
5-
log_driver: gelf
6-
log_opt:
7-
gelf-address: "udp://127.0.0.1:EEEEE"
1+
version: "2"
82

9-
hasher:
10-
build: hasher
11-
ports:
12-
- "8002:80"
13-
log_driver: gelf
14-
log_opt:
15-
gelf-address: "udp://127.0.0.1:EEEEE"
3+
services:
4+
5+
rng:
6+
build: rng
7+
ports:
8+
- "8001:80"
9+
logging:
10+
driver: gelf
11+
options:
12+
gelf-address: udp://localhost:12201
1613

17-
webui:
18-
build: webui
19-
links:
20-
- redis
21-
ports:
22-
- "8000:80"
23-
volumes:
24-
- "./webui/files/:/files/"
25-
log_driver: gelf
26-
log_opt:
27-
gelf-address: "udp://127.0.0.1:EEEEE"
14+
hasher:
15+
build: hasher
16+
ports:
17+
- "8002:80"
18+
logging:
19+
driver: gelf
20+
options:
21+
gelf-address: udp://localhost:12201
2822

29-
redis:
30-
image: redis
31-
log_driver: gelf
32-
log_opt:
33-
gelf-address: "udp://127.0.0.1:EEEEE"
23+
webui:
24+
build: webui
25+
ports:
26+
- "8000:80"
27+
volumes:
28+
- "./webui/files/:/files/"
29+
logging:
30+
driver: gelf
31+
options:
32+
gelf-address: udp://localhost:12201
3433

35-
worker:
36-
build: worker
37-
links:
38-
- rng
39-
- hasher
40-
- redis
41-
log_driver: gelf
42-
log_opt:
43-
gelf-address: "udp://127.0.0.1:EEEEE"
34+
redis:
35+
image: redis
36+
logging:
37+
driver: gelf
38+
options:
39+
gelf-address: udp://localhost:12201
40+
41+
worker:
42+
build: worker
43+
logging:
44+
driver: gelf
45+
options:
46+
gelf-address: udp://localhost:12201
4447

Diff for: ‎dockercoins/docker-compose.yml-portmap

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: "2"
2+
3+
services:
4+
rng:
5+
build: rng
6+
ports:
7+
- "80"
8+
9+
hasher:
10+
build: hasher
11+
ports:
12+
- "8002:80"
13+
14+
webui:
15+
build: webui
16+
ports:
17+
- "8000:80"
18+
volumes:
19+
- "./webui/files/:/files/"
20+
21+
redis:
22+
image: redis
23+
24+
worker:
25+
build: worker
26+

Diff for: ‎dockercoins/docker-compose.yml-scaled-rng

+33-42
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,34 @@
1-
rng1:
2-
build: rng
3-
4-
rng2:
5-
build: rng
6-
7-
rng3:
8-
build: rng
9-
10-
rng:
11-
image: jpetazzo/hamba
12-
links:
13-
- rng1
14-
- rng2
15-
- rng3
16-
command: 80 rng1 80 rng2 80 rng3 80
17-
ports:
18-
- "8001:80"
19-
20-
hasher:
21-
build: hasher
22-
ports:
23-
- "8002:80"
24-
25-
webui:
26-
build: webui
27-
links:
28-
- redis
29-
ports:
30-
- "8000:80"
31-
volumes:
32-
- "./webui/files/:/files/"
33-
34-
redis:
35-
image: redis
36-
37-
worker:
38-
build: worker
39-
links:
40-
- rng
41-
- hasher
42-
- redis
1+
version: "2"
2+
3+
services:
4+
rng1:
5+
build: rng
6+
rng2:
7+
build: rng
8+
rng3:
9+
build: rng
10+
11+
rng:
12+
image: jpetazzo/hamba
13+
command: 80 rng1:80 rng2:80 rng3:80
14+
ports:
15+
- "8001:80"
16+
17+
hasher:
18+
build: hasher
19+
ports:
20+
- "8002:80"
21+
22+
webui:
23+
build: webui
24+
ports:
25+
- "8000:80"
26+
volumes:
27+
- "./webui/files/:/files/"
28+
29+
redis:
30+
image: redis
31+
32+
worker:
33+
build: worker
4334

0 commit comments

Comments
 (0)