diff --git a/Dockerfile b/Dockerfile index 9012c28..135c2ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,26 +26,18 @@ RUN \ && apt-get install -y --no-install-recommends \ build-essential \ ca-certificates \ - curl \ - file \ - git \ - golang-go \ - google-mock \ - imagemagick \ - jq \ - libegl1 \ - libgl1-mesa-glx \ - libglx-mesa0 \ libldap2-dev \ libsasl2-dev \ - libxcb-shm0 \ - libxcb-shape0 \ - libxcb-xkb-dev \ - libx11-xcb1 \ - libxkbcommon-x11-0 \ libxml2-dev \ libxslt1-dev \ libzmq3-dev \ + curl \ + file \ + git \ + google-mock \ + imagemagick \ + jq \ + calibre \ python3-dev \ python3-pip \ python3-setuptools \ @@ -88,23 +80,6 @@ RUN python3 -m venv /app \ && pip3 install --no-cache --upgrade tzdata \ && pip3 install --no-cache --upgrade netifaces-plus - - -RUN echo "**** install calibre ****" 1>&2 \ -# install calibre binary -ENV LD_LIBRARY_PATH=/usr/lib:/opt/calibre/lib -ENV PATH=$PATH:/opt/calibre/bin -ENV LC_ALL=C -ENV CALIBRE_INSTALLER=https://download.calibre-ebook.com/linux-installer.sh -RUN apt-get install -y --no-install-recommends \ - libopengl0 \ - libegl1 \ - libxcb-cursor0 \ - && curl -L ${CALIBRE_INSTALLER} \ - | sh /dev/stdin - - - RUN echo "**** download calibre-web ****" 1>&2 \ && if [ -z ${CALIBREWEB_RELEASE} ]; then \ CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ @@ -133,9 +108,8 @@ RUN echo "**** build & install calibre-web ****" 1>&2 \ -r requirements.txt \ -r optional-requirements.txt -RUN echo "**** copy unrar and kepubify to app folder ****" 1>&2 \ - && mv /usr/bin/unrar /app/bin \ - && mv ./root/go/bin/kepubify /app/bin +RUN echo "**** copy kepubify to app folder ****" 1>&2 \ + && mv /root/go/bin/kepubify /app/bin @@ -162,36 +136,24 @@ ENV PUID=1000 ENV PGID=1000 ENV TZ=Europe/Paris - - RUN echo "**** install production packages ****" 1>&2 RUN apt-get update -RUN apt-get install --no-install-recommends -y tzdata \ - libzmq5 \ - libldap2 \ - libsasl2-2 \ - libnspr4 \ - libnss3 \ - libxslt1.1 \ - libxml2 \ - libxkbcommon-x11-0 \ - libx11-xcb1 \ - libegl1 \ - libxcb-shm0 \ - libxcb-shape0 \ - imagemagick \ - bash \ - procps \ - vim \ - libxcb-xkb1 \ - python3 +RUN apt-get install --no-install-recommends -y \ + bash \ + libldap2 \ + libsasl2-2 \ + libxml2 \ + libxslt1.1 \ + ca-certificates \ + imagemagick \ + calibre \ + procps \ + python3 \ + xdg-utils \ + tzdata \ + vim COPY --from=build /app /app -COPY --from=build /opt/calibre/bin /app/bin -COPY --from=build /opt/calibre/lib/libcalibre-launcher.so /usr/lib/libcalibre-launcher.so -COPY --from=build /opt/calibre/lib/libjpeg.so.8 /usr/lib/libjpeg.so.8 -COPY --from=build /opt/calibre/lib/libpython3.11.so.1.0 /usr/lib/libpython3.11.so.1.0 -COPY --from=build /opt/calibre/lib/libpoppler.so.130 /usr/lib/libpoppler.so.130 RUN apt-get clean RUN rm -rf /var/lib/apt/lists/* \ @@ -207,10 +169,6 @@ COPY --from=build /etc/timezone /etc/timezone RUN mkdir -p /config \ && chown -R ${PUID}:${PGID} /config -WORKDIR /usr/bin -RUN ln -s /apt/bin/calibredb /usr/bin/calibredb -RUN ln -s /apt/bin/calibre /usr/bin/calibre - WORKDIR /app USER ${PUID}:${PGID}