Revert "Try this calibre install again?"

This reverts commit e471f00e43.
master
MrTyton 3 years ago
parent 94d0aa5d7d
commit 9c7dcea812

@ -56,4 +56,4 @@ jobs:
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: true push: true
tags: ${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_VERSION }} tags: ${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.RELEASE_VERSION }}
build-args: VERSION=${{env.RELEASE_VERSION}} build-args: VERSION=${{env.RELEASE_VERSION}},CALIBRE_RELEASE=${{env.CALIBRE_VERSION}},FFF_RELEASE=${{env.FFF_VERSION}}

@ -38,6 +38,7 @@ RUN set -x && \
abc abc
RUN echo "**** install calibre ****" && \ RUN echo "**** install calibre ****" && \
set -x && \
mkdir -p \ mkdir -p \
/opt/calibre && \ /opt/calibre && \
if [ -z ${CALIBRE_RELEASE+x} ]; then \ if [ -z ${CALIBRE_RELEASE+x} ]; then \
@ -51,7 +52,6 @@ RUN echo "**** install calibre ****" && \
"$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 && \
dbus-uuidgen > /etc/machine-id dbus-uuidgen > /etc/machine-id
RUN echo "**** cleanup ****" && \ RUN echo "**** cleanup ****" && \

@ -1 +1 @@
2022.03.25-26 2022.03.25-25

Loading…
Cancel
Save