Skip to content

Commit 5b5e916

Browse files
aptalcathelamer
authored andcommitted
update artifact paths
1 parent c4c91ce commit 5b5e916

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ RUN \
5151
/opt/calibre && \
5252
if [ -z ${CALIBRE_RELEASE+x} ]; then \
5353
CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
54-
| jq -r .tag_name); \
54+
| jq -r .tag_name); \
5555
fi && \
5656
CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
5757
CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \
58-
curl -o \
59-
/tmp/calibre-tarball.txz -L \
60-
"$CALIBRE_URL" && \
58+
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 \
59+
curl -fo \
60+
/tmp/calibre-tarball.txz -L \
61+
"$CALIBRE_URL"; \
62+
fi && \
6163
tar xvf /tmp/calibre-tarball.txz -C \
6264
/opt/calibre && \
6365
/opt/calibre/calibre_postinstall && \

Dockerfile.aarch64

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ RUN \
5252
/opt/calibre && \
5353
if [ -z ${CALIBRE_RELEASE+x} ]; then \
5454
CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
55-
| jq -r .tag_name); \
55+
| jq -r .tag_name); \
5656
fi && \
5757
CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
5858
CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-arm64.txz" && \
59-
curl -o \
60-
/tmp/calibre-tarball.txz -L \
61-
"$CALIBRE_URL" && \
59+
if ! curl -fo /tmp/calibre-tarball.txz -L "https://github.com/kovidgoyal/calibre/releases/download/v${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-arm64.txz"; then \
60+
curl -fo \
61+
/tmp/calibre-tarball.txz -L \
62+
"$CALIBRE_URL"; \
63+
fi && \
6264
tar xvf /tmp/calibre-tarball.txz -C \
6365
/opt/calibre && \
6466
/opt/calibre/calibre_postinstall && \

0 commit comments

Comments
 (0)