diff --git a/Dockerfile b/Dockerfile index 761f3b7..b637a3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,12 @@ RUN \ apt-get update && \ apt-get install -y \ git \ - python-pip && \ + python3-pip && \ echo "**** install runtime packages ****" && \ apt-get install -y \ imagemagick \ libxcomposite1 \ - python-minimal \ + python3-minimal \ unrar && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ @@ -33,14 +33,14 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ requirements.txt && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ optional-requirements.txt && \ echo "**** cleanup ****" && \ apt-get -y purge \ git \ - python-pip && \ + python3-pip && \ apt-get -y autoremove && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2b97da0..b72caca 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,13 +18,13 @@ RUN \ libjpeg-dev \ libxml2-dev \ libxslt1-dev \ - python-pip \ + python3-pip \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y \ imagemagick \ libxcomposite1 \ - python-minimal \ + python3-minimal \ unrar && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ @@ -40,9 +40,9 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ requirements.txt && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ optional-requirements.txt && \ echo "**** cleanup ****" && \ apt-get -y purge \ @@ -53,7 +53,7 @@ RUN \ libjpeg-dev \ libxml2-dev \ libxslt1-dev \ - python-pip \ + python3-pip \ zlib1g-dev && \ apt-get -y autoremove && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4df82ed..a72cece 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -18,13 +18,13 @@ RUN \ libjpeg-dev \ libxml2-dev \ libxslt1-dev \ - python-pip \ + python3-pip \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y \ imagemagick \ libxcomposite1 \ - python-minimal \ + python3-minimal \ unrar && \ echo "**** install calibre-web ****" && \ if [ -z ${CALIBREWEB_RELEASE+x} ]; then \ @@ -40,9 +40,9 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ requirements.txt && \ - pip install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U -r \ optional-requirements.txt && \ echo "**** cleanup ****" && \ apt-get -y purge \ @@ -53,7 +53,7 @@ RUN \ libjpeg-dev \ libxml2-dev \ libxslt1-dev \ - python-pip \ + python3-pip \ zlib1g-dev && \ apt-get -y autoremove && \ rm -rf \ diff --git a/README.md b/README.md index 3df9c1e..d67876d 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.13.19:** - Migrate to Python3. * **01.08.19:** - Add libxcomposite1. * **13.06.19:** - Add docker mod to enable optional ebook conversion on x86-64. Add unrar. * **02.06.19:** - Rebase to Ubuntu Bionic & add Gdrive support. diff --git a/readme-vars.yml b/readme-vars.yml index 867680d..f03afe8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -70,6 +70,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.13.19:", desc: "Migrate to Python3." } - { date: "01.08.19:", desc: "Add libxcomposite1." } - { date: "13.06.19:", desc: "Add docker mod to enable optional ebook conversion on x86-64. Add unrar." } - { date: "02.06.19:", desc: "Rebase to Ubuntu Bionic & add Gdrive support." } diff --git a/root/etc/services.d/calibre-web/run b/root/etc/services.d/calibre-web/run index 1dea53c..228e498 100644 --- a/root/etc/services.d/calibre-web/run +++ b/root/etc/services.d/calibre-web/run @@ -3,4 +3,4 @@ cd /app/calibre-web || exit exec \ - s6-setuidgid abc python /app/calibre-web/cps.py + s6-setuidgid abc python3 /app/calibre-web/cps.py