diff --git a/Dockerfile b/Dockerfile index 0082c13..f163bdd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Select final stage based on TARGETARCH ARG -FROM ghcr.io/ciromattia/kcc:docker-base-20230809 +FROM ghcr.io/ciromattia/kcc:docker-base-20240928 LABEL com.kcc.name="Kindle Comic Converter" LABEL com.kcc.author="Ciro Mattia Gonano, Paweł Jastrzębski and Darodi" LABEL org.opencontainers.image.description='Kindle Comic Converter' @@ -16,4 +16,4 @@ COPY . /opt/kcc RUN cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION ENTRYPOINT ["/opt/kcc/kcc-c2e.py"] -CMD ["-h"] \ No newline at end of file +CMD ["-h"] diff --git a/Dockerfile-base b/Dockerfile-base index 64dd0ed..5e8f014 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -28,6 +28,9 @@ ENV LC_ALL=C.UTF-8 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] +COPY requirements.txt /opt/kcc/ +ENV PATH="/opt/venv/bin:$PATH" + RUN set -x && \ TEMP_PACKAGES=() && \ KEPT_PACKAGES=() && \ @@ -64,9 +67,8 @@ RUN set -x && \ && \ # Install required python modules python -m pip install --upgrade pip && \ -# python -m pip install -r /opt/kcc/requirements.txt && \ python -m venv /opt/venv && \ - python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization + python -m pip install -r /opt/kcc/requirements.txt ###################################################################################### @@ -83,6 +85,9 @@ ENV LC_ALL=C.UTF-8 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] +COPY requirements.txt /opt/kcc/ +ENV PATH="/opt/venv/bin:$PATH" + RUN set -x && \ TEMP_PACKAGES=() && \ KEPT_PACKAGES=() && \ @@ -120,9 +125,8 @@ RUN set -x && \ && \ # Install required python modules python -m pip install --upgrade pip && \ -# python -m pip install -r /opt/kcc/requirements.txt && \ python -m venv /opt/venv && \ - python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization + python -m pip install --upgrade pillow psutil requests python-slugify raven packaging mozjpeg-lossless-optimization natsort[fast] distro ###################################################################################### @@ -156,5 +160,5 @@ WORKDIR /app RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \ apt-get install -y p7zip-full unrar-free && \ ln -s /app/kindlegen /bin/kindlegen && \ - echo docker-base-20230809 > /IMAGE_VERSION + echo docker-base-20240928 > /IMAGE_VERSION