New version v1.5.0

* new base image [technosoft2000/alpine-base:3.12-1](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.12.0 * fixed `[WARNING]: Empty continuation line found in: ...` in Dockerfile * upgrade of [sgerrand/alpine-pkg-glibc](https://github.com/sgerrand/alpine-pkg-glibc) to version 2.32-r0 * changed glibc compiled package (ArchLinux) `libutil-linux` to new `util-linux-libs` - see issue **Build failure in v1.4.1** #87 * updated dependencies from `requirements.txt` and `optional-requirements.txt` - see issue **Missing jsonschema in the docker image** #90 * changed python from `python2` to `python3` * allow **gevent 20.9.0** otherwise: - error will appear `<frozen importlib._bootstrap>:219: RuntimeWarning: greenlet.greenlet size changed, may indicate binary incompatibility. Expected 144 from C header, got 152 from PyObject` - see at `gevent` where the issue was known: gevent/gevent#1260 * added **unrar** * **kepubify** is not added, because Alpine Linux doesn't contains a pre-build package at the moment * updated Calibre **ebook-convert** from 4.13.0 to 5.3.0 * uses `https://github.com/Technosoft2000/docker-calibre-web/releases/download/kindlegen/kindlegen_linux_2.6_i386_v2_9.tar.gz` to download Amazon kindlegen
Technosoft2000 · Oct 24, 2020 · 7780b98 · 7780b98
1 parent f074829
commit 7780b98
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+**2020-10-24 - v1.5.0**
+
+ * new base image [technosoft2000/alpine-base:3.12-1](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.12.0
+ * fixed `[WARNING]: Empty continuation line found in: ...` in Dockerfile
+ * upgrade of [sgerrand/alpine-pkg-glibc](https://github.com/sgerrand/alpine-pkg-glibc) to version 2.32-r0
+ * changed glibc compiled package (ArchLinux) `libutil-linux` to new `util-linux-libs` - see issue **Build failure in v1.4.1** #87
+ * updated dependencies from `requirements.txt` and `optional-requirements.txt` - see issue **Missing jsonschema in the docker image** #90
+ * changed python from `python2` to `python3`
+ * allow **gevent 20.9.0** otherwise: 
+   - error will appear `<frozen importlib._bootstrap>:219: RuntimeWarning: greenlet.greenlet size changed, may indicate binary incompatibility. Expected 144 from C header, got 152 from PyObject`
+   - see at `gevent` where the issue was known: https://github.com/gevent/gevent/issues/1260
+ * added **unrar**
+ * **kepubify** is not added, because Alpine Linux doesn't contains a pre-build package at the moment
+ * updated Calibre **ebook-convert** from 4.13.0 to 5.3.0
+ * uses `https://github.com/Technosoft2000/docker-calibre-web/releases/download/kindlegen/kindlegen_linux_2.6_i386_v2_9.tar.gz` to download Amazon kindlegen
+
 **2020-04-12 - v1.4.1**
 
  * new base image [technosoft2000/alpine-base:3.11-2](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.11.5

diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,16 @@
-FROM technosoft2000/alpine-base:3.11-2
+FROM technosoft2000/alpine-base:3.12-1
 
 LABEL maintainer="Technosoft2000 <[email protected]>" \
-      image.version="1.4.0" \
+      image.version="1.5.0" \
       image.description="Docker image for Calibre Web, based on docker image of Alpine" \
-      image.date="2020-01-01" \
+      image.date="2020-10-24" \
       url.docker="https://hub.docker.com/r/technosoft2000/calibre-web" \
-      url.github="https://github.com/Technosoft2000/docker-calibre-web" \
-      url.support="https://cytec.us/forum"
+      url.github="https://github.com/Technosoft2000/docker-calibre-web"
 
 # Set basic environment settings
 ENV \
     # - VERSION: the docker image version (corresponds to the above LABEL image.version)
-    VERSION="1.4.0" \
+    VERSION="1.5.0" \
     \
     # - LANG, LANGUAGE, LC_ALL: language dependent settings (Default: en_US.UTF-8)
     LANG="en_US.UTF-8" \
@@ -36,14 +35,15 @@ ENV \
     # - AMAZON_KG_*: KindleGen is a command line tool which enables publishers to work
     # in an automated environment with a variety of source content including HTML, XHTML or EPUB
     AMAZON_KG_TAR="kindlegen_linux_2.6_i386_v2_9.tar.gz" \
-    AMAZON_KG_URL="http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v2_9.tar.gz" \
+    # AMAZON_KG_URL="http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v2_9.tar.gz" \
+    AMAZON_KG_URL="https://github.com/Technosoft2000/docker-calibre-web/releases/download/kindlegen/kindlegen_linux_2.6_i386_v2_9.tar.gz" \
     \
     # - CALIBRE_PATH: Configure the path where the Calibre database is located
     CALIBRE_PATH="/books" \
     \
     # - PKG_*: the needed applications for installation
-    PKG_DEV="build-base python-dev openssl-dev libffi-dev libxml2-dev libxslt-dev openldap-dev" \
-    PKG_PYTHON="ca-certificates libxml2 libxslt libev openldap" \
+    PKG_DEV="build-base python3-dev openssl-dev libffi-dev libxml2-dev libxslt-dev openldap-dev" \
+    PKG_PYTHON="ca-certificates libxml2 libxslt libev openldap unrar" \
     # WARNING: Wand supports only ImageMagick 6 at the moment and Alpine delivers already ImageMagick 7
     # PKG_IMAGES="imagemagick imagemagick-doc imagemagick-dev" \
     # need to build ImageMagick 6 from source
@@ -85,14 +85,14 @@ RUN \
     \
     # install python and create a symlink as python
     echo "**** install Python ****" && \
-    apk add --no-cache python2 && \
-    if [ ! -e /usr/bin/python ]; then ln -sf python2 /usr/bin/python ; fi && \
+    apk add --no-cache python3 && \
+    if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \
     \
     echo "**** install pip ****" && \
     python -m ensurepip && \
     rm -r /usr/lib/python*/ensurepip && \
+    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
     pip install --no-cache --upgrade pip setuptools wheel && \
-    #if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
     \
     # cleanup temporary files
     rm -rf /tmp && \
@@ -102,51 +102,50 @@ RUN \
 # https://github.com/sgerrand/alpine-pkg-glibc
 COPY LOCALE.md /init/
 RUN \
-
     ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \
-    ALPINE_GLIBC_PACKAGE_VERSION="2.31-r0" && \
+    ALPINE_GLIBC_PACKAGE_VERSION="2.32-r0" && \
     ALPINE_GLIBC_BASE_PACKAGE_FILENAME="glibc-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
     ALPINE_GLIBC_BIN_PACKAGE_FILENAME="glibc-bin-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
     ALPINE_GLIBC_I18N_PACKAGE_FILENAME="glibc-i18n-$ALPINE_GLIBC_PACKAGE_VERSION.apk" && \
-
+    \
     # create temporary directories
     mkdir -p /tmp && \
     mkdir -p /var/cache/apk && \
-
+    \
     apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
     apk add --no-cache parallel tar xz zstd && \
-
+    \
     wget "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
          -O "/etc/apk/keys/sgerrand.rsa.pub" && \
-
+    \
     wget "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
          "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
          "$ALPINE_GLIBC_BASE_URL/$ALPINE_GLIBC_PACKAGE_VERSION/$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-
+    \
     apk add --no-cache \
         "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
         "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
         "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" && \
-
+    \
     # iterate through all locale and install it
     # NOTE: locale -a is not available in alpine linux, 
     # use `/usr/glibc-compat/bin/locale -a` instead
     cat /init/LOCALE.md | parallel "echo generate locale {}; /usr/glibc-compat/bin/localedef --force --inputfile {} --charmap UTF-8 {}.UTF-8;" && \
-
+    \
     apk del .build-dependencies && \
-
+    \
     rm "/etc/apk/keys/sgerrand.rsa.pub" && \
     rm "/root/.wget-hsts" && \
     rm "$ALPINE_GLIBC_BASE_PACKAGE_FILENAME" \
        "$ALPINE_GLIBC_BIN_PACKAGE_FILENAME" \
        "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME"
 
-RUN wget "https://www.archlinux.org/packages/core/x86_64/libutil-linux/download/" -O /tmp/libutil-linux.tar.zst \
-    && mkdir -p /tmp/libutil-linux \
-    && tar -xf /tmp/libutil-linux.tar.zst -C /tmp/libutil-linux \
-    && cp -rP /tmp/libutil-linux/usr/lib/* /usr/glibc-compat/lib \
+RUN wget "https://www.archlinux.org/packages/core/x86_64/util-linux-libs/download/" -O /tmp/util-linux-libs.tar.zst \
+    && mkdir -p /tmp/util-linux-libs \
+    && tar -xf /tmp/util-linux-libs.tar.zst -C /tmp/util-linux-libs \
+    && cp -rP /tmp/util-linux-libs/usr/lib/* /usr/glibc-compat/lib \
     && /usr/glibc-compat/sbin/ldconfig \
-    && rm -rf /tmp/libutil-linux /tmp/libutil-linux.tar.zst
+    && rm -rf /tmp/util-linux-libs /tmp/util-linux-libs.tar.zst
 
 RUN wget "https://www.archlinux.org/packages/core/x86_64/nss/download/" -O /tmp/nss.tar.zst \
     && mkdir -p /tmp/nss \
@@ -167,67 +166,74 @@ RUN wget "https://www.archlinux.org/packages/core/x86_64/nspr/download/" -O /tmp
 RUN \
     echo "--- Update the package list ------------------------------------------------" && \
     apk -U upgrade && \
-
+    \
     echo "--- Install applications via package manager -------------------------------" && \
     apk -U add --no-cache $PKG_DEV $PKG_PYTHON $PKG_IMAGES_DEV $PKG_IMAGES $PKG_GS_DEV $PKG_GS $PKG_MAGICK_DEV $PKG_MAGICK && \
-
+    \
     echo "--- Upgrade pip to the latest version --------------------------------------" && \
     pip install --upgrade pip && \
-
+    \
     echo "--- Install python packages via pip ----------------------------------------" && \
     pip --no-cache-dir install --upgrade \
         setuptools \
         pyopenssl \
     ### REQUIRED ###
     ### see https://github.com/janeczku/calibre-web/blob/master/requirements.txt
-        'Babel>=1.3' \
-        'Flask-Babel>=0.11.1' \
-        'Flask-Login>=0.3.2' \
-        'Flask-Principal>=0.3.2' \
-        'singledispatch>=3.4.0.0' \
+    ### https://github.com/janeczku/calibre-web/commit/1cb640e51e52bb6a02e2cecaf6cb3e9bd2b1349e
+        'Babel>=1.3,<2.9' \
+        'Flask-Babel>=0.11.1,<1.1.0' \
+        'Flask-Login>=0.3.2,<0.5.1' \
+        'Flask-Principal>=0.3.2,<0.5.1' \
+        'singledispatch>=3.4.0.0,<3.5.0.0' \
         'backports_abc>=0.4' \
-        'Flask>=1.0.2' \
-        'iso-639>=0.4.5' \
-        'PyPDF2==1.26.0' \
+        'Flask>=1.0.2,<1.2.0' \
+        'iso-639>=0.4.5,<0.5.0' \
+        'PyPDF2==1.26.0,<1.27.0' \
         'pytz>=2016.10' \
-        'requests>=2.11.1' \
-        'SQLAlchemy>=1.1.0' \
-        'tornado>=4.1' \
-        'Wand>=0.4.4' \
-        'unidecode>=0.04.19' \
+        'requests>=2.11.1,<2.24.0' \
+        'SQLAlchemy>=1.3.0,<1.4.0' \
+        'tornado>=4.1,<6.1' \
+        'Wand>=0.4.4,<0.6.0' \
+        'unidecode>=0.04.19,<1.2.0' \
     ### OPTIONAL ###
     ### https://github.com/janeczku/calibre-web/blob/master/optional-requirements.txt
+    ### https://github.com/janeczku/calibre-web/commit/7ba014ba499df954e9019ec524293817d520212f
         # GDrive Integration
-        'google-api-python-client==1.7.11' \
-        'gevent>=1.2.1' \
-        'greenlet>=0.4.12' \
-        'httplib2>=0.9.2' \
-        'oauth2client>=4.0.0' \
-        'uritemplate>=3.0.0' \
-        'pyasn1-modules>=0.0.8' \
-        'pyasn1>=0.1.9' \
-        'PyDrive>=1.3.1' \
+        'google-api-python-client==1.7.11,<1.8.0' \
+        # allow gevent 20.9.0 otherwise: 
+        # <frozen importlib._bootstrap>:219: RuntimeWarning: greenlet.greenlet size changed, may indicate binary incompatibility. Expected 144 from C header, got 152 from PyObject
+        # https://github.com/gevent/gevent/issues/1260
+        'gevent>=1.2.1,<20.9.1' \
+        'greenlet>=0.4.12,<0.5.0' \
+        'httplib2>=0.9.2,<0.18.0' \
+        'oauth2client>=4.0.0,<4.1.4' \
+        'uritemplate>=3.0.0,<3.1.0' \
+        'pyasn1-modules>=0.0.8,<0.3.0' \
+        'pyasn1>=0.1.9,<0.5.0' \
+        'PyDrive>=1.3.1,<1.4.0' \
         'PyYAML>=3.12' \
-        'rsa==3.4.2' \
-        'six==1.10.0' \
+        'rsa==3.4.2,<4.1.0' \
+        'six>=1.10.0,<1.15.0' \
         # goodreads
-        'goodreads>=0.3.2' \
-        'python-Levenshtein>=0.12.0' \
+        'goodreads>=0.3.2,<0.4.0' \
+        'python-Levenshtein>=0.12.0,<0.13.0' \
         # ldap login
-        'python_ldap>=3.0.0' \
-        'flask-simpleldap>1.3.0' \
+        'python-ldap>=3.0.0,<3.3.0' \
+        'Flask-SimpleLDAP>=1.4.0,<1.5.0' \
         #oauth
-        'flask-dance>=0.13.0' \
-        'sqlalchemy_utils>=0.33.5' \
+        'Flask-Dance>=1.4.0,<3.1.0' \
+        'SQLAlchemy-Utils>=0.33.5,<0.37.0' \
         # extracting metadata
-        'lxml>=3.8.0' \
-        'Pillow>=4.0.0' \
+        'lxml>=3.8.0,<4.6.0' \
+        'Pillow>=4.0.0,<7.2.0' \
         'rarfile>=2.7' \
         # other
-        'natsort>=2.2.0' \
-        'git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi' \
+        'natsort>=2.2.0,<7.1.0' \
+        'git+https://github.com/OzzieIsaacs/comicapi.git@b323fab55e7daba97f90bf59a4bc8de9d9c0a86b#egg=comicapi' \
+        # Kobo integration
+        'jsonschema>=3.2.0,<3.3.0' \
     && \
-
+    \
     # cleanup temporary files
     rm -rf /tmp/* 
 
@@ -250,29 +256,29 @@ RUN \
         gcc \
         libxcomposite \
         mesa-gl \
-        python \
+        python3 \
         qt5-qtbase-x11 \
         xdg-utils \
         xz \
         wget && \
-
-    # download Calibre version 4.13.0
+    \
+    # download Calibre version 5.3.0
     wget -O- ${CALIBRE_INSTALLER_SOURCE_CODE_URL} | \
-      python -c \
-      "import sys; \
-       main=lambda:sys.stderr.write('Download failed\n'); \
-       exec(sys.stdin.read()); \
-       main(install_dir='/opt', isolated=True, version='4.13.0')" && \
-
+        python -c \
+        "import sys; \
+        main=lambda:sys.stderr.write('Download failed\n'); \
+        exec(sys.stdin.read()); \
+        main(install_dir='/opt', isolated=True, version='5.3.0')" && \
+    \
     rm -rf /tmp/calibre-installer-cache && \
-
+    \
     # remove not needed packages
     apk del --purge $PKG_DEV \
                     $PKG_IMAGES_DEV && \
-
+    \
     # create Calibre Web folder structure
     mkdir -p $APP_HOME/app && \
-
+    \
     # cleanup temporary files
     rm -rf /tmp && \
     rm -rf /var/cache/apk/*

diff --git a/README.md b/README.md
@@ -38,6 +38,22 @@ And if you are interested in the original __Calibre__ ebook management tool then
 
 ## Updates ##
 
+**2020-10-24 - v1.5.0**
+
+ * new base image [technosoft2000/alpine-base:3.12-1](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.12.0
+ * fixed `[WARNING]: Empty continuation line found in: ...` in Dockerfile
+ * upgrade of [sgerrand/alpine-pkg-glibc](https://github.com/sgerrand/alpine-pkg-glibc) to version 2.32-r0
+ * changed glibc compiled package (ArchLinux) `libutil-linux` to new `util-linux-libs` - see issue **Build failure in v1.4.1** #87
+ * updated dependencies from `requirements.txt` and `optional-requirements.txt` - see issue **Missing jsonschema in the docker image** #90
+ * changed python from `python2` to `python3`
+ * allow **gevent 20.9.0** otherwise: 
+   - error will appear `<frozen importlib._bootstrap>:219: RuntimeWarning: greenlet.greenlet size changed, may indicate binary incompatibility. Expected 144 from C header, got 152 from PyObject`
+   - see at `gevent` where the issue was known: https://github.com/gevent/gevent/issues/1260
+ * added **unrar**
+ * **kepubify** is not added, because Alpine Linux doesn't contains a pre-build package at the moment
+ * updated Calibre **ebook-convert** from 4.13.0 to 5.3.0
+ * uses `https://github.com/Technosoft2000/docker-calibre-web/releases/download/kindlegen/kindlegen_linux_2.6_i386_v2_9.tar.gz` to download Amazon kindlegen
+
 **2020-04-12 - v1.4.1**
 
  * new base image [technosoft2000/alpine-base:3.11-2](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.11.5
@@ -69,6 +85,7 @@ For previous changes see at [full changelog](CHANGELOG.md).
  * creation of gdrive.db symlink at `/books/gdrive.db` for external access like backup possibility
  * creation of app.db symlink at `/books/app.db` for external access like backup possibility
  * support of **Amazon kindlegen** and **Calibre ebook-convert** tool to convert to MOBI
+ * **Calibre ebook-convert** uses `glibc` and therefore additional packages from **ArchLinux** are needed
 
 ## Hints & Tips ##
 

diff --git a/build.sh b/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t technosoft2000/calibre-web .
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		docker build -t technosoft2000/calibre-web .