diff --git a/Dockerfile.lxml b/Dockerfile.lxml index 679120b1..6bccb36e 100644 --- a/Dockerfile.lxml +++ b/Dockerfile.lxml @@ -3,7 +3,8 @@ ARG BRANCH_NAME=master ENV BRANCH_NAME ${BRANCH_NAME} ENV TINI_VERSION v0.19.0 ENV PMM_DOCKER True -COPY requirements-lxml.txt requirements-lxml.txt +COPY requirements.txt requirements.txt +RUN sed -i -E "s/(lxml==.+)version/\15.1.1" requirements.txt RUN echo "**** install system packages ****" \ && apt-get update \ && apt-get upgrade -y --no-install-recommends \ @@ -11,14 +12,14 @@ RUN echo "**** install system packages ****" \ && apt-get install -y gcc g++ libxml2-dev libxslt-dev libz-dev libjpeg62-turbo-dev zlib1g-dev wget curl \ && wget -O /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-"$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ && chmod +x /tini \ - && pip3 install --no-cache-dir --upgrade --requirement /requirements-lxml.txt \ + && pip3 install --no-cache-dir --upgrade --requirement /requirements.txt \ && apt-get --purge autoremove gcc g++ libxml2-dev libxslt-dev libz-dev -y \ && apt-get clean \ && apt-get update \ && apt-get check \ && apt-get -f install \ && apt-get autoclean \ - && rm -rf /requirements-lxml.txt /tmp/* /var/tmp/* /var/lib/apt/lists/* + && rm -rf /requirements.txt /tmp/* /var/tmp/* /var/lib/apt/lists/* COPY . / VOLUME /config ENTRYPOINT ["/tini", "-s", "python3", "plex_meta_manager.py", "--"] diff --git a/VERSION b/VERSION index ee700f52..57bc7f9a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.21.0-develop7 +1.21.0-develop8 diff --git a/requirements-lxml.txt b/requirements-lxml.txt deleted file mode 100644 index 013ec684..00000000 --- a/requirements-lxml.txt +++ /dev/null @@ -1,16 +0,0 @@ -arrapi==1.4.7 -GitPython==3.1.43 -lxml==5.1.1 -num2words==0.5.13 -pathvalidate==3.2.0 -pillow==10.3.0 -PlexAPI==4.15.11 -psutil==5.9.8 -python-dotenv==1.0.1 -python-dateutil==2.9.0.post0 -requests==2.31.0 -retrying==1.3.4 -ruamel.yaml==0.18.6 -schedule==1.2.1 -setuptools==69.2.0 -tmdbapis==1.2.9 \ No newline at end of file