patch the patch

This commit is contained in:
2025-03-08 10:24:41 +01:00
parent df91db9735
commit 7e4fe2e203
4 changed files with 102 additions and 40 deletions

View File

@@ -18,26 +18,29 @@ RUN cp /etc/apt/sources.list.d/debian.sources \
RUN \
echo "**** install build packages ****" 1>&2 \
&& apt update \
&& apt install -y build-essential \
&& apt install -y tzdata \
&& apt install -y libzmq3-dev \
&& apt install -y libldap-dev \
&& apt install -y libsasl2-dev \
&& apt install -y libxml2-dev \
&& apt install -y libxslt1-dev \
&& apt install -y imagemagick \
&& apt install -y git \
&& apt install -y jq \
&& apt install -y curl \
&& apt install -y wget \
&& apt install -y xz-utils \
&& apt install -y bash \
&& apt install -y python3-pip \
&& apt install -y python3-venv \
&& apt install -y python3-dev \
&& apt install -y python3-setuptools \
&& apt install -y golang-go
&& apt-get update \
&& apt-get install -y libxcb-xkb-dev \
&& apt-get install -y build-essential \
&& apt-get install -y tzdata \
&& apt-get install -y libzmq3-dev \
&& apt-get install -y libldap-dev \
&& apt-get install -y libsasl2-dev \
&& apt-get install -y libxml2-dev \
&& apt-get install -y libxslt1-dev \
&& apt-get install -y imagemagick \
&& apt-get install -y git \
&& apt-get install -y jq \
&& apt-get install -y curl \
&& apt-get install -y wget \
&& apt-get install -y xz-utils \
&& apt-get install -y bash \
&& apt-get install -y python3-pip \
&& apt-get install -y python3-venv \
&& apt-get install -y python3-dev \
&& apt-get install -y python3-setuptools \
&& apt-get install -y golang-go \
&& apt-get install -y google-mock \
&& apt-get install -y file
RUN echo "**** create tmp dir ****" 1>&2 \
&& mkdir -p /tmp
@@ -79,9 +82,9 @@ 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 install -y libopengl0 \
&& apt install -y libegl1 \
&& apt install -y libxcb-cursor0 \
RUN apt-get install -y libopengl0 \
&& apt-get install -y libegl1 \
&& apt-get install -y libxcb-cursor0 \
&& curl -L ${CALIBRE_INSTALLER} \
| sh /dev/stdin
@@ -97,8 +100,9 @@ RUN echo "**** download calibre-web ****" 1>&2 \
RUN echo "**** apply calibre-web patches ****" 1>&2 \
&& cd /app/calibreweb \
&& for p in /tmp/patches/calibre-web/* ; do \
patch -p0 < ${p} ; \
&& for p in /tmp/patches/calibre-web/*.patch ; do \
patch -p0 < ${p} \
|| cat optional-requirements.txt ; \
done
RUN echo "**** build & install calibre-web ****" 1>&2 \
@@ -116,8 +120,6 @@ RUN echo "**** copy unrar and kepubify to app folder ****" 1>&2 \
RUN yes | /app/bin/pip3 uninstall google-api-python-client
RUN yes | /app/bin/pip3 uninstall gevent
RUN yes | /app/bin/pip3 uninstall greenlet
RUN yes | /app/bin/pip3 uninstall httplib2
RUN yes | /app/bin/pip3 uninstall oauth2client
RUN yes | /app/bin/pip3 uninstall uritemplate
@@ -150,12 +152,13 @@ RUN apt-get install --no-install-recommends -y tzdata \
libsasl2-2 \
libnspr4 \
libnss3 \
libxslt1 \
libxslt1.1 \
libxml2 \
imagemagick \
bash \
procps \
vim \
libxcb-xkb1 \
python3
COPY --from=build /app /app