Skip to content

Commit 5b270c3

Browse files
committed
Update dockerfiles and add .coveragerc file to specify which modules to cover with coverage.py
1 parent 9b10efa commit 5b270c3

5 files changed

Lines changed: 29 additions & 15 deletions

File tree

.dev.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DJANGO_ALLOWED_HOSTS="localhost 127.0.0.1"
1010
DEBUG=1
1111
DEV="true"
1212

13-
COVERAGE_FILE=/app/coverage/.coverage
13+
COVERAGE_FILE=/home/backend-user/app/coverage/.coverage
1414

1515
GOOGLE_RECAPTCHA_SITE_KEY="6LdUY0YgAAAAAExsOicJY4fPA3r8o0MibEcLaiNb"
1616
GOOGLE_RECAPTCHA_SECRET_KEY="6LdUY0YgAAAAAC0MMmNfY3zwXVWF7V7MyE0oEME-"

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: >
2424
docker-compose --env-file .dev.env run --rm django sh -c
2525
"cd backend && pylint src
26-
--rcfile=/app/.pylintrc
26+
--rcfile=/home/backend-user/app/.pylintrc
2727
--load-plugins pylint_django
2828
--django-settings-module=config.settings
2929
--output-format=colorized"

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ services:
2525
ports:
2626
- "8000:8000"
2727
command: >
28-
sh -c "python ./backend/manage.py wait_for_db &&
29-
python ./backend/manage.py migrate &&
30-
python ./backend/manage.py runserver 0.0.0.0:8000"
28+
sh -c "python backend/manage.py wait_for_db &&
29+
python backend/manage.py migrate &&
30+
python backend/manage.py runserver 0.0.0.0:8000"
3131
volumes:
32-
- ./backend:/app/backend
33-
- coverage:/app/coverage
32+
- ./backend:/home/backend-user/app/backend
33+
- coverage:/home/backend-user/app/coverage
3434
depends_on:
3535
- db
3636
volumes:

dockerfiles/django/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ ENV PYTHONDONTWRITEBYTECODE 1
55
# Turns off buffering for easier container logging
66
ENV PYTHONUNBUFFERED 1
77

8-
RUN mkdir -p /app/coverage && \
9-
addgroup -S backend-group && \
10-
adduser -S backend-user -G backend-group
8+
RUN addgroup -S backend-group && \
9+
adduser -S backend-user -G backend-group && \
10+
mkdir -p /home/backend-user/app/coverage
1111

1212

1313
COPY ./dockerfiles/django/requirements/requirements.txt /tmp/requirements.txt
1414
COPY ./dockerfiles/django/requirements/dev.requirements.txt /tmp/dev.requirements.txt
1515

16-
COPY ./dockerfiles/django/requirements/pytest.ini /app/pytest.ini
17-
COPY ./dockerfiles/django/requirements/.pylintrc /app/.pylintrc
16+
COPY ./dockerfiles/django/requirements/pytest.ini /home/backend-user/app/pytest.ini
17+
COPY ./dockerfiles/django/requirements/.pylintrc /home/backend-user/app/.pylintrc
18+
COPY ./dockerfiles/django/requirements/.coveragerc /home/backend-user/app/.coveragerc
1819

19-
COPY ./.git /app/.git
20+
COPY ./.git /home/backend-user/app/.git
2021

2122

22-
WORKDIR /app
23+
WORKDIR /home/backend-user/app
2324

2425
EXPOSE 8000
2526

@@ -37,7 +38,7 @@ RUN python -m venv /venv && \
3738
fi && \
3839
rm -rf /tmp && \
3940
apk del .tmp-build-deps && \
40-
chown -R backend-user:backend-group /app
41+
chown -R backend-user:backend-group /home/backend-user/app
4142

4243
ENV PATH="/venv/bin:$PATH"
4344

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[run]
2+
source=backend
3+
4+
omit =
5+
*/config/*
6+
*/migrations/*
7+
*/tests/*
8+
*/__init__.py
9+
*/manage.py
10+
*/apps.py
11+
*/urls.py
12+
*/admin.py
13+
*/forms.py

0 commit comments

Comments
 (0)