diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 59c0e2f..6823723 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -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}} diff --git a/Dockerfile b/Dockerfile index eb9366b..e93794e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,21 +38,21 @@ RUN set -x && \ abc RUN echo "**** install calibre ****" && \ - mkdir -p \ - /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); \ - 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" && \ - tar xvf /tmp/calibre-tarball.txz -C \ - /opt/calibre && \ - /opt/calibre/calibre_postinstall && \ - dbus-uuidgen > /etc/machine-id + set -x && \ + mkdir -p \ + /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); \ + 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" && \ + tar xvf /tmp/calibre-tarball.txz -C \ + /opt/calibre && \ + dbus-uuidgen > /etc/machine-id RUN echo "**** cleanup ****" && \ rm -rf \ diff --git a/release-versions/latest.txt b/release-versions/latest.txt index a684006..993de2a 100644 --- a/release-versions/latest.txt +++ b/release-versions/latest.txt @@ -1 +1 @@ -2022.03.25-26 +2022.03.25-25