Dockerfile fix?

This commit is contained in:
MrTyton 2022-03-25 18:11:05 -04:00
parent 833ad9df39
commit 5a09dea983
2 changed files with 17 additions and 16 deletions

View File

@ -38,21 +38,22 @@ RUN mkdir -p /opt/calibre && \
python3 python3
RUN echo "**** install calibre ****" && \ RUN echo "**** install calibre ****" && \
mkdir -p \ mkdir -p \
/opt/calibre && \ /opt/calibre && \
if [ -z ${CALIBRE_RELEASE+x} ]; then \ if [ -z ${CALIBRE_RELEASE+x} ]; then \
CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
| jq -r .tag_name); \ | jq -r .tag_name); \
fi && \ fi && \
CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \ CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \ CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \
curl -o \ curl -o \
/tmp/calibre-tarball.txz -L \ /tmp/calibre-tarball.txz -L \
"$CALIBRE_URL" && \ "$CALIBRE_URL" && \
tar xvf /tmp/calibre-tarball.txz -C \ tar xvf /tmp/calibre-tarball.txz -C \
/opt/calibre && \ /opt/calibre && \
/opt/calibre/calibre_postinstall && \ ls /opt/calibre && \
dbus-uuidgen > /etc/machine-id /opt/calibre/calibre_postinstall && \
dbus-uuidgen > /etc/machine-id
RUN echo "**** cleanup ****" && \ RUN echo "**** cleanup ****" && \
apt-get clean && \ apt-get clean && \

View File

@ -1 +1 @@
v2022.03.25-2 v2022.03.25-3