Skip to content

Commit dc64c03

Browse files
committed
Update Docker configs, add lint workflow, and remove unused env files
1 parent 2ce97ae commit dc64c03

5 files changed

Lines changed: 35 additions & 8 deletions

File tree

.devcontainer/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- ..:/workspace:cached
1010
working_dir: /workspace/src
1111
env_file:
12-
- ../.env
12+
- ../.env_files/.env
1313

1414
command: sleep infinity
1515
depends_on:
@@ -22,7 +22,7 @@ services:
2222
- ..:/workspace:cached
2323
working_dir: /workspace/src
2424
env_file:
25-
- ../.env
25+
- ../.env_files/.env
2626

2727
command: celery -A backend worker --loglevel=info
2828
depends_on:
@@ -37,7 +37,7 @@ services:
3737
- ..:/workspace:cached
3838
working_dir: /workspace/src
3939
env_file:
40-
- ../.env
40+
- ../.env_files/.env
4141
command: celery -A backend beat --loglevel=info --scheduler django_celery_beat.schedulers:DatabaseScheduler
4242
depends_on:
4343
- redis
@@ -57,7 +57,7 @@ services:
5757
ports:
5858
- "5432:5432"
5959
env_file:
60-
- ../.env
60+
- ../.env_files/.env
6161

6262
volumes:
6363
postgres-data:
File renamed without changes.
File renamed without changes.

.github/workflows/lint.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Lint & Format
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
jobs:
10+
lint:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Set up Python
15+
uses: actions/setup-python@v5
16+
with:
17+
python-version: "3.11"
18+
- name: Install dependencies
19+
run: pip install -r requirements.txt
20+
- name: Run Black
21+
run: black --check .
22+
- name: Run isort
23+
run: isort --check-only .
24+
- name: Run flake8
25+
run: flake8 .
26+
- name: Run mypy
27+
run: mypy your_project/

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
volumes:
88
- ./:/workspace:cached
99
env_file:
10-
- .env
10+
- .env_files/.env
1111
command: ["/bin/sh", "/workspace/scripts/django/start.sh"]
1212
ports:
1313
- "8000:8000"
@@ -25,7 +25,7 @@ services:
2525
volumes:
2626
- ./:/workspace:cached
2727
env_file:
28-
- .env
28+
- .env_files/.env
2929
command: ["/bin/sh", "/workspace/scripts/celery/worker.sh"]
3030
depends_on:
3131
db:
@@ -43,7 +43,7 @@ services:
4343
- ./:/workspace:cached
4444
working_dir: /workspace/src
4545
env_file:
46-
- .env
46+
- .env_files/.env
4747
command: ["/bin/sh", "/workspace/scripts/celery/beat.sh"]
4848
depends_on:
4949
db:
@@ -74,7 +74,7 @@ services:
7474
ports:
7575
- "5432:5432"
7676
env_file:
77-
- .env
77+
- .env_files/.env
7878
networks:
7979
- backend
8080
healthcheck:

0 commit comments

Comments
 (0)