Skip to content

Commit 0ccd84f

Browse files
committed
celery and celery-tasks added and deployed, db in dev added, limit of chosen tasks added
1 parent 39bd391 commit 0ccd84f

20 files changed

Lines changed: 517 additions & 67 deletions

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,5 @@ dmypy.json
136136

137137
cache
138138

139-
nginx/static
139+
static
140140
/emails/

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ COPY poetry.lock pyproject.toml /procollab/
2121
RUN poetry config virtualenvs.create false \
2222
&& poetry install --no-root
2323

24-
RUN mkdir /procollab/staticfiles
2524
RUN mkdir /procollab/static
2625

2726
COPY . /procollab/

docker-compose.dev-ci.yml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ services:
77
context: .
88
dockerfile: ./Dockerfile
99
restart: unless-stopped
10+
command: bash ./scripts/startup.sh
1011
env_file:
1112
- .env
1213
environment:
1314
HOST: 0.0.0.0
1415
volumes:
1516
- static-volume:/procollab/static
16-
17+
- .:/procollab
1718

1819
nginx:
1920
container_name: skills_nginx
@@ -32,7 +33,39 @@ services:
3233
- 6379
3334
volumes:
3435
- redis-data:/data
36+
depends_on:
37+
- web
38+
39+
celerys:
40+
restart: always
41+
build:
42+
context: .
43+
dockerfile: ./Dockerfile
44+
env_file:
45+
- .env
46+
command: bash ./scripts/celery.sh
47+
#command: ls -la
48+
depends_on:
49+
- redis
50+
- web
51+
volumes:
52+
- .:/procollab
53+
54+
db:
55+
container_name: skills_db
56+
image: postgres
57+
environment:
58+
POSTGRES_DB: postgres
59+
POSTGRES_USER: postgres
60+
POSTGRES_PASSWORD: postgres
61+
ports:
62+
- 5432:5432
63+
restart: always
64+
volumes:
65+
- postgres_data:/var/lib/postgresql/data/
66+
3567

3668
volumes:
3769
redis-data:
3870
static-volume:
71+
postgres_data:

0 commit comments

Comments
 (0)