From 63478b85fa27dd1699b3869732300590f635081d Mon Sep 17 00:00:00 2001 From: chbmb Date: Thu, 14 Jan 2021 19:44:09 +0000 Subject: [PATCH 1/3] Update to focal. Can't be merged to master until upstream push a new release. See [here](https://github.com/janeczku/calibre-web/issues/1755) Will fix [this](https://github.com/linuxserver/docker-calibre-web/issues/108) and also will close pending PR [here](https://github.com/linuxserver/docker-calibre-web/pull/111) --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96fadc2..a761207 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5251539..2a1fd10 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 11b221b..da9c6c2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index afe8312..63ebc1a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -71,6 +71,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.01.21:", desc: "Update to Ubuntu Focal base"} - { date: "12.10.20:", desc: "Add libxi6"} - { date: "12.07.20:", desc: "Add kepubify for arm64v8" } - { date: "05.06.20:", desc: "Add kepubify for x86-64 and arm32v7" } From 050bfcf3555d6290ec51551c70b1e98dd52c3972 Mon Sep 17 00:00:00 2001 From: chbmb Date: Sun, 17 Jan 2021 20:32:01 +0000 Subject: [PATCH 2/3] Update readme to include link to armhf troubleshooting. --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 63ebc1a..f3e3ce9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -71,7 +71,7 @@ app_setup_block: | # changelog changelogs: - - { date: "13.01.21:", desc: "Update to Ubuntu Focal base"} + - { date: "13.01.21:", desc: "Rebase to Ubuntu Focal, see [here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal) for troubleshooting armhf." } - { date: "12.10.20:", desc: "Add libxi6"} - { date: "12.07.20:", desc: "Add kepubify for arm64v8" } - { date: "05.06.20:", desc: "Add kepubify for x86-64 and arm32v7" } From 3d7e848b8c867c6b81db36343cf17b2e9ef627a6 Mon Sep 17 00:00:00 2001 From: chbmb Date: Sun, 17 Jan 2021 22:42:40 +0000 Subject: [PATCH 3/3] Add libssl-dev so cryptography compiles correctly. --- Dockerfile.armhf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index da9c6c2..239bb7c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,6 +18,7 @@ RUN \ libjpeg-dev \ libldap2-dev \ libsasl2-dev \ + libssl-dev \ libxml2-dev \ libxslt1-dev \ python3-pip \ @@ -68,6 +69,7 @@ RUN \ libjpeg-dev \ libldap2-dev \ libsasl2-dev \ + libssl-dev \ libxml2-dev \ libxslt1-dev \ python3-pip \