diff --git a/Dockerfile b/Dockerfile index 5e7d3c1..0d64c95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,26 +28,29 @@ RUN \ python3-minimal \ python3-pkg-resources \ unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ - CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ + echo "**** install calibre-web (a worse way than LSIO's method) ****" && \ + # if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ + # CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ + # | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + # fi && \ + # curl -o \ + # /tmp/calibre-web.tar.gz -L \ + # https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ + # mkdir -p \ + # /app/calibre-web && \ + # tar xf \ + # /tmp/calibre-web.tar.gz -C \ + # /app/calibre-web --strip-components=1 && \ + # this is my lazy alternative to lsio's pretty one: + git clone https://gitlab.jafner.net/Jafner/calibre-web.git /app/calibre-web && \ + # cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ pip && \ pip install --no-cache-dir -U --ignore-installed --find-links https://wheel-index.linuxserver.io/ubuntu/ -r \ requirements.txt -r \ optional-requirements.txt && \ - echo "***install kepubify" && \ + echo "**** install kepubify ****" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ KEPUBIFY_RELEASE=$(curl -sX GET "https://api.github.com/repos/pgaskin/kepubify/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index da3fbbb..4e3b1fb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -35,19 +35,22 @@ RUN \ python3-minimal \ python3-pkg-resources \ unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ - CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ + echo "**** install calibre-web (a worse way than LSIO's method) ****" && \ + # if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ + # CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ + # | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + # fi && \ + # curl -o \ + # /tmp/calibre-web.tar.gz -L \ + # https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ + # mkdir -p \ + # /app/calibre-web && \ + # tar xf \ + # /tmp/calibre-web.tar.gz -C \ + # /app/calibre-web --strip-components=1 && \ + # this is my lazy alternative to lsio's pretty one: + git clone https://gitlab.jafner.net/Jafner/calibre-web.git /app/calibre-web && \ + # cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ pip && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 649cbd3..78ceeb6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -37,19 +37,22 @@ RUN \ python3-minimal \ python3-pkg-resources \ unrar && \ - echo "**** install calibre-web ****" && \ - if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ - CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/calibre-web.tar.gz -L \ - https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ - mkdir -p \ - /app/calibre-web && \ - tar xf \ - /tmp/calibre-web.tar.gz -C \ - /app/calibre-web --strip-components=1 && \ + echo "**** install calibre-web (a worse way than LSIO's method) ****" && \ + # if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ + # CALIBREWEB_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \ + # | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + # fi && \ + # curl -o \ + # /tmp/calibre-web.tar.gz -L \ + # https://github.com/janeczku/calibre-web/archive/${CALIBREWEB_RELEASE}.tar.gz && \ + # mkdir -p \ + # /app/calibre-web && \ + # tar xf \ + # /tmp/calibre-web.tar.gz -C \ + # /app/calibre-web --strip-components=1 && \ + # this is my lazy alternative to lsio's pretty one: + git clone https://gitlab.jafner.net/Jafner/calibre-web.git /app/calibre-web && \ + # cd /app/calibre-web && \ pip3 install --no-cache-dir -U \ pip && \