Update with actual base image and new Calibre

Technosoft2000 · Apr 12, 2020 · f074829 · f074829
1 parent 12a0e45
commit f074829
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+**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
+ * upgrade of [sgerrand/alpine-pkg-glibc](https://github.com/sgerrand/alpine-pkg-glibc) to version 2.31-r0
+ * updated to Calibre 4.13.0
+ * added the packages tar xz zstd to unpack needed Arch Linux packages which are compiled with glibc
+ * still no upgrade to Python 3 because it doesn't work correct, get the following error:
+```
+[INFO] Launching Calibre-Web ...
+Traceback (most recent call last):
+  File "/calibre-web/app/cps.py", line 34, in <module>
+    from cps import create_app
+  File "/calibre-web/app/cps/__init__.py", line 28, in <module>
+    from babel import Locale as LC
+ImportError: No module named babel
+```
+ * maybe I'll switch the base image because Alpine gets to hacky to run Calibre Web correctly, because of the glibc dependencies - see also at https://pythonspeed.com/articles/base-image-python-docker-images/
+ * or maybe I'll switch to the linuxserver/calibre-web docker image and discontinue maintanance of this image
+ * IMPORTANT regarding update: if you've issues then remove the content from your volume mount -v <your Calibre Web application folder>:/calibre-web/app before you start the container
+
 **2020-01-05 - v1.4.0**
 
  * new base image [technosoft2000/alpine-base:3.11-1](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.11.2

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
-FROM technosoft2000/alpine-base:3.11-1
-MAINTAINER Technosoft2000 <technosoft2000@gmx.net>
-LABEL image.version="1.4.0" \
+FROM technosoft2000/alpine-base:3.11-2
+
+LABEL maintainer="Technosoft2000 <technosoft2000@gmx.net>" \
+      image.version="1.4.0" \
       image.description="Docker image for Calibre Web, based on docker image of Alpine" \
       image.date="2020-01-01" \
       url.docker="https://hub.docker.com/r/technosoft2000/calibre-web" \
@@ -103,7 +104,7 @@ COPY LOCALE.md /init/
 RUN \
 
     ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \
-    ALPINE_GLIBC_PACKAGE_VERSION="2.30-r0" && \
+    ALPINE_GLIBC_PACKAGE_VERSION="2.31-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" && \
@@ -113,7 +114,7 @@ RUN \
     mkdir -p /var/cache/apk && \
 
     apk add --no-cache --virtual=.build-dependencies wget ca-certificates && \
-    apk add --no-cache parallel && \
+    apk add --no-cache parallel tar xz zstd && \
 
     wget "https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub" \
          -O "/etc/apk/keys/sgerrand.rsa.pub" && \
@@ -140,23 +141,26 @@ RUN \
        "$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.xz \
+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.xz -C /tmp/libutil-linux \
-    && cp /tmp/libutil-linux/usr/lib/* /usr/glibc-compat/lib \
+    && tar -xf /tmp/libutil-linux.tar.zst -C /tmp/libutil-linux \
+    && cp -rP /tmp/libutil-linux/usr/lib/* /usr/glibc-compat/lib \
     && /usr/glibc-compat/sbin/ldconfig \
-    && rm -rf /tmp/libutil-linux /tmp/libutil-linux.tar.xz
+    && rm -rf /tmp/libutil-linux /tmp/libutil-linux.tar.zst
 
-# TODO
-# /usr/glibc-compat/sbin/ldconfig: /usr/glibc-compat/lib/ld-linux-x86-64.so.2 is not a symbolic link
-# /usr/glibc-compat/sbin/ldconfig: /usr/glibc-compat/lib/libsmartcols.so.1 is not a symbolic link
-# /usr/glibc-compat/sbin/ldconfig: /usr/glibc-compat/lib/libmount.so.1 is not a symbolic link
-# /usr/glibc-compat/sbin/ldconfig: /usr/glibc-compat/lib/libuuid.so.1 is not a symbolic link
-# /usr/glibc-compat/sbin/ldconfig: /usr/glibc-compat/lib/libblkid.so.1 is not a symbolic link
-# /usr/glibc-compat/sbin/ldconfig: /usr/glibc-compat/lib/libfdisk.so.1 is not a symbolic link
+RUN wget "https://www.archlinux.org/packages/core/x86_64/nss/download/" -O /tmp/nss.tar.zst \
+    && mkdir -p /tmp/nss \
+    && tar -xf /tmp/nss.tar.zst -C /tmp/nss \
+    && cp -rP /tmp/nss/usr/lib/* /usr/glibc-compat/lib \
+    && /usr/glibc-compat/sbin/ldconfig \
+    && rm -rf /tmp/nss /tmp/nss.tar.zst
 
-# Copy the necessary Ghostscript 9.26 patches
-#COPY ghostscript /init/ghostscript/
+RUN wget "https://www.archlinux.org/packages/core/x86_64/nspr/download/" -O /tmp/nspr.tar.zst \
+    && mkdir -p /tmp/nspr \
+    && tar -xf /tmp/nspr.tar.zst -C /tmp/nspr \
+    && cp -rP /tmp/nspr/usr/lib/* /usr/glibc-compat/lib \
+    && /usr/glibc-compat/sbin/ldconfig \
+    && rm -rf /tmp/nspr /tmp/nspr.tar.zst
 
 # TODO
 # ERROR: comicapi 2.0 has requirement natsort==3.5.2, but you'll have natsort 6.2.0 which is incompatible.
@@ -224,76 +228,6 @@ RUN \
         'git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi' \
     && \
 
-    ### Ghostscript ###
-    #echo "--- Get Ghostscript 9.26 and build it --------------------------------------" && \
-
-    # create temporary build directory for Ghostscript
-    #mkdir -p /tmp/ghostscript && \
-
-    # download Ghostscript
-    #curl -o /tmp/ghostscript-src.tar.gz -L "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/ghostscript-9.26.tar.gz" && \
-
-    # unpack Ghostscript
-    #tar xf /tmp/ghostscript-src.tar.gz -C /tmp/ghostscript --strip-components=1 && \
-
-    # patch & configure Ghostscript
-    #cp /init/ghostscript/* /tmp/ghostscript && \
-    #cd /tmp/ghostscript && \
-    #patch cups/gdevcups.c fix-sprintf.patch && \
-    #patch base/gdevsclass.c fix-put_image-methode.patch && \
-    #patch base/stdio_.h fix-stdio.patch && \
-    #patch base/lib.mak ghostscript-system-zlib.patch && \
-    #./configure && \
-
-    # compile Ghostscript
-    #make so all && \
-
-    # install Ghostscript
-    #make soinstall && \
-    #make install && \
-
-    ### ImageMagic ###
-    #echo "--- Get ImageMagic 6 and build it ------------------------------------------" && \
-    #IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
-	  # | grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' | sed 's/^.*ImageMagick-/ImageMagick-/') && \
-
-    # create temporary build directory for ImageMagic
-    #mkdir -p /tmp/imagemagick && \
-
-    # download ImageMagic
-    #curl -o /tmp/imagemagick-src.tar.xz -L "http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \
-
-    # unpack ImageMagic
-    #tar xf /tmp/imagemagick-src.tar.xz -C /tmp/imagemagick --strip-components=1 && \
-
-    # configure ImageMagic
-    #cd /tmp/imagemagick && \
-
-    #sed -i -e \
-	  #'s:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \
-	  #configure && \
-
-    #./configure \
-	  #--infodir=/usr/share/info \
-	  #--mandir=/usr/share/man \
-	  #--prefix=/usr \
-	  #--sysconfdir=/etc \
-	  #--with-gs-font-dir=/usr/share/fonts/Type1 \
-	  #--with-gslib \
-	  #--with-lcms2 \
-	  #--with-modules \
-	  #--without-threads \
-	  #--without-x \
-	  #--with-tiff \
-	  #--with-xml && \
-
-    # compile ImageMagic
-    #make && \
-
-    # install ImageMagic
-    #make install && \
-    #find / -name '.packlist' -o -name 'perllocal.pod' -o -name '*.bs' -delete && \
-
     # cleanup temporary files
     rm -rf /tmp/* 
 
@@ -322,13 +256,13 @@ RUN \
         xz \
         wget && \
 
-    # download Calibre version 3.48.0
+    # download Calibre version 4.13.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='3.48.0')" && \
+       main(install_dir='/opt', isolated=True, version='4.13.0')" && \
 
     rm -rf /tmp/calibre-installer-cache && \
 

diff --git a/README.md b/README.md
@@ -38,11 +38,25 @@ And if you are interested in the original __Calibre__ ebook management tool then
 
 ## Updates ##
 
-**2020-01-05 - v1.4.0**
+**2020-04-12 - v1.4.1**
 
- * new base image [technosoft2000/alpine-base:3.11-1](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.11.2
- * will be upgraded in near future to Python 3
- * still uses Calibre version 3.48.0 to keep working ebook-convert - see at [calibre-web/issues/1056](https://github.com/janeczku/calibre-web/issues/1056)
+ * new base image [technosoft2000/alpine-base:3.11-2](https://hub.docker.com/r/technosoft2000/alpine-base/) based on Alpine 3.11.5
+ * upgrade of [sgerrand/alpine-pkg-glibc](https://github.com/sgerrand/alpine-pkg-glibc) to version 2.31-r0
+ * updated to Calibre 4.13.0
+ * added the packages tar xz zstd to unpack needed Arch Linux packages which are compiled with glibc
+ * still no upgrade to Python 3 because it doesn't work correct, get the following error:
+```
+[INFO] Launching Calibre-Web ...
+Traceback (most recent call last):
+  File "/calibre-web/app/cps.py", line 34, in <module>
+    from cps import create_app
+  File "/calibre-web/app/cps/__init__.py", line 28, in <module>
+    from babel import Locale as LC
+ImportError: No module named babel
+```
+ * maybe I'll switch the base image because Alpine gets to hacky to run Calibre Web correctly, because of the glibc dependencies - see also at https://pythonspeed.com/articles/base-image-python-docker-images/
+ * or maybe I'll switch to the linuxserver/calibre-web docker image and discontinue maintanance of this image
+ * IMPORTANT regarding update: if you've issues then remove the content from your volume mount -v <your Calibre Web application folder>:/calibre-web/app before you start the container
 
 For previous changes see at [full changelog](CHANGELOG.md).