Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion docker-compose-progs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version: "2.1"
services:

progs:
image: eu.gcr.io/openedx-231314/edraak/progs
image: eu.gcr.io/openedx-231314/edraak/progs:latest
environment:
PROGS_CFG: /app/docker.json
NODE_ENV: development
Expand All @@ -31,6 +31,29 @@ services:
- ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
- ~/.ssh/:/root/.ssh

celery:
image: eu.gcr.io/openedx-231314/edraak/progs:latest
environment:
PROGS_CFG: /app/docker.json
container_name: edraak.devstack.programs.celery
command: bash -c 'while true; do celery -A edraakprograms worker -l INFO; sleep 2; done'
restart: always
working_dir: /app
depends_on:
- redis
volumes:
- progs_media:/edx/var/progs/media
- ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
- ~/.ssh/:/root/.ssh

flower:
image: mher/flower:0.9.7
command: [ 'flower', '--broker=redis://redis:6379', '--port=5555' ]
ports:
- 5557:5555
depends_on:
- redis

router:
depends_on:
- progs
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ services:
- analytics.edraak.dev
- auth.edraak.dev

redis:
image: "redis:alpine"
expose:
- 6379

volumes:
elasticsearch_data:
mongo_data:
Expand Down
3 changes: 3 additions & 0 deletions progs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ progs.build:
progs.pushimage:
docker push eu.gcr.io/openedx-231314/edraak/progs

progs.makemigrations:
docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py makemigrations --settings=edraakprograms.dev

progs.migrate:
docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev

Expand Down