Skip to content

Commit f7da2e6

Browse files
committed
meteor rebuild, various fix
1 parent 8a44765 commit f7da2e6

File tree

2 files changed

+52
-74
lines changed

2 files changed

+52
-74
lines changed

celery/.travis.yml

-18
This file was deleted.

docker-compose.yml

+52-56
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,82 @@
11
version: '2'
22
services:
3-
# meteor:
4-
# image: wdhif/transcode-meteor
5-
# expose:
6-
# - "80"
7-
# links:
8-
# - mongo_1
9-
# - mongo_2
10-
# - mongo_3
11-
# - mongo_setup
12-
# environment:
13-
# # TODO: Check ROOT_URL=> Optionnal? IPaddress of master node ?
14-
# # ROOT_URL: "http://transcode.com"
15-
# ROOT_URL: balancer
16-
# MONGO_URL: "mongodb://mongo_1:27017,mongo_2:27017,mongo_3:27017/transcode?replicaSet=transcode"
17-
# CLUSTER_DISCOVERY_URL: "mongodb://mongo_1:27017,mongo_2:27017,mongo_3:27017/transcode?replicaSet=transcode"
18-
# CLUSTER_SERVICE: "web"
19-
# DATABASE: transcode
20-
# REPLICA_SET_ID: transcode
21-
# PRIMARY_MEMBER: mongo_1:27017
22-
# SECONDARY_MEMBERS: mongo_2:27017,mongo_3:27017
23-
# mongo_1:
24-
# image: mongo
25-
# command: --smallfiles --replSet transcode --quiet
26-
# mongo_2:
27-
# image: mongo
28-
# command: --smallfiles --replSet transcode --quiet
29-
# mongo_3:
30-
# image: mongo
31-
# command: --smallfiles --replSet transcode --quiet
32-
# mongo_setup:
33-
# image: wdhif/mongo-replicaset-setup
34-
# links:
35-
# - mongo_1
36-
# - mongo_2
37-
# - mongo_3
38-
# environment:
39-
# DATABASE: transcode
40-
# REPLICA_SET_ID: transcode
41-
# PRIMARY_MEMBER: mongo_1:27017
42-
# SECONDARY_MEMBERS: mongo_2:27017,mongo_3:27017
3+
meteor:
4+
image: wdhif/transcode-meteor
5+
expose:
6+
- "80"
7+
links:
8+
- mongo_1
9+
- mongo_2
10+
- mongo_3
11+
- mongo_setup
12+
environment:
13+
# TODO: ROOT_URL ? IPaddress of master node ?
14+
# ROOT_URL: "http://transcode.com"
15+
MONGO_URL: "mongodb://mongo_1:27017,mongo_2:27017,mongo_3:27017/transcode?replicaSet=transcode"
16+
CLUSTER_DISCOVERY_URL: "mongodb://mongo_1:27017,mongo_2:27017,mongo_3:27017/transcode?replicaSet=transcode"
17+
CLUSTER_SERVICE: "web"
18+
DATABASE: transcode
19+
REPLICA_SET_ID: transcode
20+
PRIMARY_MEMBER: mongo_1:27017
21+
SECONDARY_MEMBERS: mongo_2:27017,mongo_3:27017
22+
mongo_1:
23+
image: mongo
24+
command: --smallfiles --replSet transcode --quiet
25+
mongo_2:
26+
image: mongo
27+
command: --smallfiles --replSet transcode --quiet
28+
mongo_3:
29+
image: mongo
30+
command: --smallfiles --replSet transcode --quiet
31+
mongo_setup:
32+
image: wdhif/mongo-replicaset-setup
33+
links:
34+
- mongo_1
35+
- mongo_2
36+
- mongo_3
37+
environment:
38+
DATABASE: transcode
39+
REPLICA_SET_ID: transcode
40+
PRIMARY_MEMBER: mongo_1:27017
41+
SECONDARY_MEMBERS: mongo_2:27017,mongo_3:27017
4342
data:
4443
image: ubuntu
45-
command: sleep infinity
4644
volumes:
4745
- /var/lib/data
46+
command: sleep infinity
4847
core:
4948
image: wdhif/transcode-celery
49+
expose:
50+
- "5555"
51+
links:
52+
- broker
5053
environment:
5154
- C_FORCE_ROOT=true
5255
- BROKER_URL=amqp://guest:guest@broker//
5356
- CELERY_BROKER_URL=amqp://guest:guest@broker//
54-
links:
55-
- broker
5657
volumes_from:
57-
- data
58+
- data
5859
volumes:
5960
- ./scripts:/home/user
6061
command: bash -c "celery -A core worker -l info --app=core.core.app"
61-
expose:
62-
- "5555"
6362
broker:
6463
image: rabbitmq
65-
# image: tumtum/rabbitmq
66-
# environment:
67-
# - RABBITMQ_PASS=transcode
6864
expose:
6965
- "5672"
7066
worker:
7167
image: wdhif/transcode-celery
68+
expose:
69+
- "5555"
70+
links:
71+
- core
72+
- broker
7273
environment:
7374
- C_FORCE_ROOT=true
7475
- BROKER_URL=amqp://guest:guest@broker//
7576
- CELERY_BROKER_URL=amqp://guest:guest@broker//
7677
# - CELERY_APP=tasks
77-
links:
78-
- core
79-
- broker
80-
volumes_from:
81-
- data
8278
volumes:
8379
- ./scripts:/home/user
80+
volumes_from:
81+
- data
8482
command: bash -c "celery -A worker worker -l info --app=worker.worker.app"
85-
expose:
86-
- "5555"

0 commit comments

Comments
 (0)