From 472c8b25bb7f301e406772ac04c2c15f4b4aaff1 Mon Sep 17 00:00:00 2001 From: kappa118 Date: Sat, 1 Mar 2025 19:27:21 -0500 Subject: [PATCH] just use one container, reinstall necessary packages on dev start --- docker/Dockerfile.dev | 52 ----------------------------------- docker/docker-compose-aio.yml | 23 ---------------- docker/entrypoint.aio.sh | 1 + uwsg.aio.ini | 19 ------------- 4 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 docker/Dockerfile.dev delete mode 100644 docker/docker-compose-aio.yml delete mode 100644 uwsg.aio.ini diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev deleted file mode 100644 index c0ad6f42..00000000 --- a/docker/Dockerfile.dev +++ /dev/null @@ -1,52 +0,0 @@ -FROM alpine - -ENV PATH="/dispatcharrpy/bin:$PATH" \ - VIRTUAL_ENV=/dispatcharrpy \ - DJANGO_SETTINGS_MODULE=dispatcharr.settings \ - PYTHONUNBUFFERED=1 - -RUN apk add \ - python3 \ - python3-dev \ - gcc \ - musl-dev \ - linux-headers \ - py3-pip \ - ffmpeg \ - streamlink \ - vlc \ - libpq-dev \ - gcc \ - py3-virtualenv \ - uwsgi \ - uwsgi-python \ - nodejs \ - npm \ - git \ - redis - -COPY ./ /app/ - -RUN \ - mkdir /data && \ - virtualenv /dispatcharrpy && \ - cd /app && \ - /dispatcharrpy/bin/pip install --no-cache-dir -r requirements.txt && \ - cd /app/frontend && \ - npm install && \ - cd /app && \ - python manage.py collectstatic --noinput || true - -# Cleanup -RUN \ - apk del \ - git \ - gcc \ - musl-dev \ - python3-dev \ - linux-headers - -WORKDIR /app - -CMD ["/usr/sbin/uwsgi", "--ini", "uwsgi.ini"] -# CMD ["gunicorn", "--workers=4", "--worker-class=gevent", "--timeout=300", "--bind", "0.0.0.0:5656", "dispatcharr.wsgi:application"] diff --git a/docker/docker-compose-aio.yml b/docker/docker-compose-aio.yml deleted file mode 100644 index 1bae29fc..00000000 --- a/docker/docker-compose-aio.yml +++ /dev/null @@ -1,23 +0,0 @@ -services: - dispatcharr: - build: - context: .. - dockerfile: docker/DockerfileAIO - container_name: dispatcharr-dev - restart: unless-stopped - ports: - - 9191:9191 - #- 5432:5432 - environment: - - PUID=1000 - - PGID=1000 - - POSTGRES_HOST=localhost - - POSTGRES_USER=dispatch - - POSTGRES_PASSWORD=secret - - POSTGRES_PORT=5432 - - POSTGRES_DB=dispatcharr - - DJANGO_SUPERUSER_USERNAME=admin - - DJANGO_SUPERUSER_PASSWORD=admin - - DJANGO_SUPERUSER_EMAIL=admin@dispatcharr.local - volumes: - - ./data:/app/data diff --git a/docker/entrypoint.aio.sh b/docker/entrypoint.aio.sh index dee4ceae..9fa92629 100755 --- a/docker/entrypoint.aio.sh +++ b/docker/entrypoint.aio.sh @@ -4,6 +4,7 @@ case "$DISPATCHARR_ENV" in "dev") echo "DISPATCHARR_ENV is set to 'dev'. Running Development Program..." + apk add nodejs npm cd /app/frontend && npm install exec /usr/sbin/uwsgi --ini uwsgi.dev.ini ;; diff --git a/uwsg.aio.ini b/uwsg.aio.ini deleted file mode 100644 index 5c1f6709..00000000 --- a/uwsg.aio.ini +++ /dev/null @@ -1,19 +0,0 @@ -[uwsgi] -preexec = python manage.py collectstatic --noinput -preexec = python manage.py migrate --noinput - -http-socket = [::]:9191 -buffer-size = 32768 -enable-threads -plugin = python3 -module = dispatcharr.wsgi:application -static-map = /static=staticfiles -thunder-lock -disable-write-exception - -virtualenv = /dispatcharrpy - -max-fd = 10000 - -attach-daemon = celery -A dispatcharr worker -l info -attach-daemon = redis-server