sam/AutomatedFanfic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Try this calibre install again?"

Browse Source 
This reverts commit e471f00e43.
This commit is contained in:
MrTyton 2022-03-25 23:31:22 -04:00
parent 94d0aa5d7d
commit 9c7dcea812
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-image.yml vendored
View File

@ -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}}

30
Dockerfile
View File

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

2
release-versions/latest.txt
View File

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