diff --git a/Dockerfile b/Dockerfile index 90c10c2..99f1f4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM python:3.8.5-alpine3.12 +FROM python:3.8.10-alpine3.13 RUN mkdir code WORKDIR code -RUN apk add --no-cache gcc musl-dev linux-headers mariadb-dev +RUN apk add --no-cache gcc musl-dev linux-headers vim bash COPY requirements.txt requirements.txt diff --git a/docker-compose.yml b/docker-compose.yml index da59154..7805626 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: "web.env" restart: on-failure volumes: - - mordor_db:/db.sqlite3 + - mordor_db:/code/db - /var/www/mordor/static:/static command: > sh -c "python manage.py collectstatic --no-input diff --git a/mordor/settings.py b/mordor/settings.py index 92cf6c7..035415a 100644 --- a/mordor/settings.py +++ b/mordor/settings.py @@ -79,7 +79,7 @@ WSGI_APPLICATION = "mordor.wsgi.application" DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "NAME": BASE_DIR / "db" / "db.sqlite3", } }