create parent assets folder for static and media

.dockerignore

@@ -3,6 +3,6 @@ __pycache__
 .env
 venv
 src/db/db.sqlite3
-src/static/*
-src/media/images/*
-!src/media/images/none.svg
+src/assets/static/*
+src/assets/media/images/*
+!src/assets/media/images/none.svg

.gitignore

@@ -3,6 +3,6 @@ __pycache__
 .env
 venv
 src/db/db.sqlite3
-src/static/*
-src/media/images/*
-!src/media/images/none.svg
+src/assets/static/*
+src/assets/media/images/*
+!src/assets/media/images/none.svg

Dockerfile

@@ -17,8 +17,7 @@ COPY ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh && \
 	groupmod -g 1000 users && \
 	useradd -u 911 -U -M  -s /bin/bash abc && \
-	usermod -G users abc && \
-	mkdir -p static
+	usermod -G users abc
 
 COPY src ./
 

docker-compose.yml

@@ -5,26 +5,26 @@ services:
     build:
       context: .
     environment:
+      - TMDB_API=TMDB_API
+      - MAL_API=MAL_API
+      - SECRET=SECRET
       - ALLOWED_HOSTS=192.168.1.1, yamtarr.domain.com
       - PUID=1000
       - PGID=1000
     volumes:
       - ./db:/app/db
-      - static:/app/static
-      - media:/app/media
+      - assets:/app/assets
 
   yamtarr-gateway:
     container_name: yamtarr-gateway
     build:
       context: ./gateway
     volumes:
-      - static:/vol/static
-      - media:/vol/media
+      - assets:/vol
     ports:
       - "8080:8080"
     depends_on:
       - yamtarr
 
 volumes:
-  static:
-  media:
+  assets:

entrypoint.sh

@@ -8,8 +8,7 @@ PGID=${PGID:-911}
 groupmod -o -g "$PGID" abc
 usermod -o -u "$PUID" abc
 chown -R abc:abc db
-chown -R abc:abc media
-chown -R abc:abc static
+chown -R abc:abc assets
 
 gosu abc:abc sh -c "python manage.py migrate --noinput &&
 python manage.py collectstatic --noinput --ignore=*.scss && 

src/base/settings.py

@@ -126,8 +126,8 @@ USE_TZ = True
 
 STATIC_URL = 'static/'
 MEDIA_URL = 'media/'
-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+STATIC_ROOT = os.path.join(BASE_DIR, 'assets/static')
+MEDIA_ROOT = os.path.join(BASE_DIR, 'assets/media')
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
@@ -154,6 +154,6 @@ STATICFILES_FINDERS = [
 
 SASS_PROCESSOR_ENABLED = True
 
-SASS_PROCESSOR_ROOT = os.path.join(BASE_DIR,'static')
+SASS_PROCESSOR_ROOT = os.path.join(BASE_DIR,'assets/static')
 
 SASS_OUTPUT_STYLE = 'compact'