diff --git a/Dockerfile b/Dockerfile index 46ab765..e7cb807 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,13 @@ ARG DEBIAN_FRONTEND="noninteractive" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="chbmb" +RUN \ + mkdir -p \ + /root-layer && \ + CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's/^v//g') && \ + echo $CALIBRE_RELEASE > /root-layer/CALIBRE_RELEASE + # copy local files COPY root/ /root-layer/ diff --git a/root/etc/cont-init.d/98-calibre b/root/etc/cont-init.d/98-calibre index 2fbf3c9..5ed0a5a 100644 --- a/root/etc/cont-init.d/98-calibre +++ b/root/etc/cont-init.d/98-calibre @@ -31,6 +31,7 @@ fi export DEBIAN_FRONTEND="noninteractive" +CALIBRE_RELEASE="$(cat /CALIBRE_RELEASE)" PACKAGES+=("xz-utils") if [ ! -L /usr/lib/x86_64-linux-gnu/libGL.so.1 ]; then @@ -60,11 +61,9 @@ fi echo "**** Fetching calibre bin ****" if [ -z ${CALIBRE_RELEASE+x} ]; then CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's/^v//g'); \ fi -CALIBRE_RELEASE=$(echo "${CALIBRE_RELEASE}" | sed 's/^v//g' ) - mkdir -p \ /app/calibre