diff --git a/compose/django/Dockerfile b/compose/django/Dockerfile index 50eecaa..d7148d2 100644 --- a/compose/django/Dockerfile +++ b/compose/django/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.71.0-buster +FROM rust:1.74.0-buster # Setup labels LABEL version = "2.0" @@ -19,11 +19,11 @@ RUN apt-get purge python python3 -y WORKDIR /install RUN apt-get install build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev \ libreadline-dev libffi-dev curl libbz2-dev git -y -RUN wget https://www.python.org/ftp/python/3.11.2/Python-3.11.2.tar.xz -RUN tar -xf Python-3.11.2.tar.xz +RUN wget https://www.python.org/ftp/python/3.12.1/Python-3.12.1.tar.xz +RUN tar -xf Python-3.12.1.tar.xz # Configure Python -WORKDIR /install/Python-3.11.2 +WORKDIR /install/Python-3.12.1 RUN ./configure --enable-optimizations RUN make install @@ -37,5 +37,8 @@ RUN pip3 install -r requirements.txt # Copy application source COPY . . +# Configure Git +RUN git config --system --add safe.directory /code + # Set starting configuration ENTRYPOINT ["./compose/services-check.sh"] diff --git a/compose/selenium/Dockerfile b/compose/selenium/Dockerfile index d38f2aa..26c7100 100644 --- a/compose/selenium/Dockerfile +++ b/compose/selenium/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.2-buster +FROM python:3.12.1-bullseye # Setup labels LABEL version = "1.0" @@ -16,12 +16,12 @@ RUN apt-get install unzip xvfb libxi6 libgconf-2-4 default-jdk -y # Install Chrome driver WORKDIR /install # Uncomment below for development on x64. e.g. Intel® Core™, AMD Ryzen™, etc. -#RUN wget -O chromedriver.zip https://github.com/electron/electron/releases/download/v12.2.3/chromedriver-v12.2.3-linux-x64.zip +#RUN wget -O chromedriver.zip https://github.com/electron/electron/releases/download/v25.9.8/chromedriver-v25.9.8-linux-x64.zip # Uncomment below for development on arm64. e.g. Apple Silicon™. -# RUN wget -O chromedriver.zip https://github.com/electron/electron/releases/download/v12.2.3/chromedriver-v12.2.3-linux-arm64.zip +# RUN wget -O chromedriver.zip https://github.com/electron/electron/releases/download/v25.9.8/chromedriver-v25.9.8-linux-arm64.zip # Comment below temporarily during development when using an overwrite from above. # Uncomment below for runtime on armv7. e.g. Raspberry Pi chipsets and similar. -RUN wget -O chromedriver.zip https://github.com/electron/electron/releases/download/v12.2.3/chromedriver-v12.2.3-linux-armv7l.zip +RUN wget -O chromedriver.zip https://github.com/electron/electron/releases/download/v25.9.8/chromedriver-v25.9.8-linux-armv7l.zip RUN unzip chromedriver.zip RUN mv chromedriver /usr/bin/chromedriver RUN chown root:root /usr/bin/chromedriver diff --git a/config/settings.py b/config/settings.py index fecaef3..b44442f 100644 --- a/config/settings.py +++ b/config/settings.py @@ -15,7 +15,7 @@ # Build information of the Web DL API -VERSION = '3.2.3' +VERSION = '3.3.0' REPOSITORY = 'https://github.com/web-dl-tools/api.git' # Build paths inside the project like this: os.path.join(BASE_DIR, ...) diff --git a/docker-compose.yml b/docker-compose.yml index d104bf4..5da2aac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: - ${FILES_PATH}:/code/files redis: - image: redis:7.0.5-bullseye + image: redis:7.2.3-bookworm container_name: web-dl_redis deploy: resources: diff --git a/requirements.txt b/requirements.txt index 0f21382..a664986 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,22 +1,22 @@ -psycopg2==2.9.5 +psycopg2==2.9.9 -django==4.1.7 +django==5.0 djangorestframework==3.14.0 -django-cors-headers==3.13.0 +django-cors-headers==4.3.1 django-polymorphic==3.1.0 django-rest-polymorphic==0.1.10 -django-filter==22.1 +django-filter==23.5 -sentry-sdk==1.15.0 -whitenoise==6.4.0 +sentry-sdk==1.39.1 +whitenoise==6.6.0 daphne==4.0.0 channels==4.0.0 -channels-redis==4.0.0 -requests==2.28.2 -markdown==3.4.1 -celery==5.2.7 -redis==4.5.1 +channels-redis==4.1.0 +requests==2.31.0 +markdown==3.5.1 +celery==5.3.6 +redis==5.0.1 -yt-dlp==2023.10.13 +yt-dlp==2023.11.16 python-qbittorrent==0.4.3 -selenium==4.8.2 +selenium==4.16.0