Skip to content

Commit a60a16f

Browse files
committed
Upgrade docker-compose file version
1 parent 0fc5f35 commit a60a16f

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM python:3.6
22
ENV PYTHONUNBUFFERED 1
33

4-
RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 && chmod +x /usr/local/bin/dumb-init
5-
64
RUN mkdir /code
75
WORKDIR /code
86

docker-compose.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2'
1+
version: '3.7'
22
volumes:
33
dbvolume:
44
services:
@@ -38,17 +38,21 @@ services:
3838
build: .
3939
env_file:
4040
- .env
41-
volumes_from:
42-
- web
41+
volumes:
42+
- .:/code
43+
- /static/
44+
- ./services/services_conf.cfg:/code/services/services_conf.cfg
4345
command: celery worker -A ac_mediator --concurrency=${CELERY_CONCURRENCY}
4446
depends_on:
4547
- redis
4648
celery_beat:
4749
build: .
4850
env_file:
4951
- .env
50-
volumes_from:
51-
- web
52+
volumes:
53+
- .:/code
54+
- /static/
55+
- ./services/services_conf.cfg:/code/services/services_conf.cfg
5256
command: celery beat -A ac_mediator
5357
depends_on:
5458
- redis
@@ -59,8 +63,3 @@ services:
5963
command: flower --address=0.0.0.0 --port=5555 --broker=redis://redis --url_prefix=flower
6064
depends_on:
6165
- celery
62-
#redmon: # Redis monitoring
63-
# build: ./docker/redmon/
64-
# command: redmon --port=4567 --redis=redis://redis --base-path=/redmon --secure=${REDMON_BASIC_AUTH}
65-
# depends_on:
66-
# - redis

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ django-oauth-toolkit==0.10.0
55
django-extensions==1.7.4
66
django-docs==0.2.1
77
dj-database-url==0.4.1
8-
psycopg2==2.6.2
8+
psycopg2-binary==2.8.4
99
requests==2.21.0
1010
Sphinx==1.4
1111
Pygments==2.1.3

0 commit comments

Comments
 (0)