Skip to content

Commit 158ef1f

Browse files
committed
fix: weird merge thing
1 parent 895ee84 commit 158ef1f

1 file changed

Lines changed: 0 additions & 41 deletions

File tree

config/docker/docker-compose.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,47 +41,6 @@ services:
4141
"-c",
4242
"/app/config/docker/entrypoint.sh"
4343
]
44-
othello_celery:
45-
container_name: othello_celery
46-
image: othello_django
47-
depends_on:
48-
- othello_postgres
49-
- othello_redis
50-
volumes:
51-
- ../../:/app
52-
working_dir: /app
53-
networks:
54-
- othello_network
55-
entrypoint:
56-
[
57-
"/bin/sh",
58-
"-c",
59-
"uv run celery --app othello worker -l INFO -Ofair"
60-
]
61-
networks:
62-
- othello_network
63-
othello_django:
64-
container_name: othello_django
65-
image: othello_django
66-
build:
67-
context: ../../
68-
dockerfile: config/docker/Dockerfile
69-
ports:
70-
- "8000:8000"
71-
depends_on:
72-
- othello_postgres
73-
- othello_redis
74-
volumes:
75-
- ../../:/app
76-
working_dir: /app
77-
networks:
78-
- othello_network
79-
entrypoint:
80-
[
81-
"/bin/sh",
82-
"-c",
83-
"/app/config/docker/entrypoint.sh"
84-
]
8544
othello_celery:
8645
container_name: othello_celery
8746
image: othello_django

0 commit comments

Comments
 (0)