diff --git a/backend/.gitignore b/backend/.gitignore index 677cee1..b1d24a7 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -141,7 +141,7 @@ media/ # Spyder project settings .spyderproject .spyproject - +nginx.conf # Rope project settings .ropeproject diff --git a/backend/core/settings.py b/backend/core/settings.py index c89a936..de9c1f1 100644 --- a/backend/core/settings.py +++ b/backend/core/settings.py @@ -167,11 +167,11 @@ USE_I18N = True USE_TZ = True -STATIC_URL = '/static/' -STATIC_ROOT = BASE_DIR / "staticfiles" +MEDIA_URL = '/shop_media/' +MEDIA_ROOT = '/app/media' -MEDIA_URL = '/media/' -MEDIA_ROOT = BASE_DIR / 'media' +STATIC_URL = '/shop_static/' +STATIC_ROOT = '/app/static' STATICFILES_DIRS = [ os.path.join(BASE_DIR, 'static'), diff --git a/backend/dockerfile b/backend/dockerfile index 8852b5f..9e24e11 100644 --- a/backend/dockerfile +++ b/backend/dockerfile @@ -11,4 +11,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . /app/ -CMD ["sh", "-c", "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"] \ No newline at end of file +CMD ["sh", "-c", "python manage.py makemigrations && python manage.py migrate && python manage.py collectstatic && python manage.py runserver 0.0.0.0:8000"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bad31f5..e6d7f15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,8 @@ services: - db volumes: - ./backend:/app - - media_data:/app/media + - /root/vol/shop/media:/app/media + - /root/vol/shop/static:/app/static command: [ "sh",