diff --git a/Dockerfile b/Dockerfile index 4a58d579..a9bcdf76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,13 +51,15 @@ RUN \ /opt/calibre && \ if [ -z ${CALIBRE_RELEASE+x} ]; then \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \ - | jq -r .tag_name); \ + | jq -r .tag_name); \ fi && \ CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \ CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \ - curl -o \ - /tmp/calibre-tarball.txz -L \ - "$CALIBRE_URL" && \ + if ! curl -fo /tmp/calibre-tarball.txz -L "https://github.com/kovidgoyal/calibre/releases/download/v${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz"; then \ + curl -fo \ + /tmp/calibre-tarball.txz -L \ + "$CALIBRE_URL"; \ + fi && \ tar xvf /tmp/calibre-tarball.txz -C \ /opt/calibre && \ /opt/calibre/calibre_postinstall && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e9fc8ce2..110bf34c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -52,13 +52,15 @@ RUN \ /opt/calibre && \ if [ -z ${CALIBRE_RELEASE+x} ]; then \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \ - | jq -r .tag_name); \ + | jq -r .tag_name); \ fi && \ CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \ CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-arm64.txz" && \ - curl -o \ - /tmp/calibre-tarball.txz -L \ - "$CALIBRE_URL" && \ + if ! curl -fo /tmp/calibre-tarball.txz -L "https://github.com/kovidgoyal/calibre/releases/download/v${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-arm64.txz"; then \ + curl -fo \ + /tmp/calibre-tarball.txz -L \ + "$CALIBRE_URL"; \ + fi && \ tar xvf /tmp/calibre-tarball.txz -C \ /opt/calibre && \ /opt/calibre/calibre_postinstall && \