Revert "Try this calibre install again?"
This reverts commit e471f00e43
.
This commit is contained in:
parent
94d0aa5d7d
commit
9c7dcea812
2
.github/workflows/docker-image.yml
vendored
2
.github/workflows/docker-image.yml
vendored
@ -56,4 +56,4 @@ jobs:
|
||||
platforms: linux/amd64,linux/arm64
|
||||
push: true
|
||||
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
|
||||
|
||||
RUN echo "**** install calibre ****" && \
|
||||
set -x && \
|
||||
mkdir -p \
|
||||
/opt/calibre && \
|
||||
if [ -z ${CALIBRE_RELEASE+x} ]; then \
|
||||
@ -51,7 +52,6 @@ RUN echo "**** install calibre ****" && \
|
||||
"$CALIBRE_URL" && \
|
||||
tar xvf /tmp/calibre-tarball.txz -C \
|
||||
/opt/calibre && \
|
||||
/opt/calibre/calibre_postinstall && \
|
||||
dbus-uuidgen > /etc/machine-id
|
||||
|
||||
RUN echo "**** cleanup ****" && \
|
||||
|
@ -1 +1 @@
|
||||
2022.03.25-26
|
||||
2022.03.25-25
|
||||
|
Loading…
Reference in New Issue
Block a user