Merge pull request #11 from linuxserver/deprecate_cpu_core

deprecate cpu_core routine lack of scaling

Dockerfile

@@ -1,24 +1,81 @@
-FROM lsiobase/alpine.python:3.6
-MAINTAINER sparklyballs,chbmb
+FROM lsiobase/alpine.python:3.7
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="chbmb"
 
-# install build packages
 RUN \
+ echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
+	file \
+	fontconfig-dev \
+	freetype-dev \
 	g++ \
 	gcc \
+	ghostscript-dev \
+	lcms2-dev \
+	libjpeg-turbo-dev \
+	libpng-dev \
+	libtool \
+	libwebp-dev \
+	libxml2-dev \
+	libxslt-dev \
 	make \
-	python2-dev && \
-
-# install runtime packages
+	perl-dev \
+	python2-dev \
+	tiff-dev \
+	xz \
+	zlib-dev && \
+ echo "**** install runtime packages ****" && \
  apk add --no-cache \
-	imagemagick && \
-
-# install calibre-web
+	fontconfig \
+	freetype \
+	ghostscript \
+	lcms2 \
+	libjpeg-turbo \
+	libltdl \
+	libpng \
+	libwebp \
+	libxml2 \
+	libxslt \
+	tiff \
+	zlib && \
+ echo "**** compile imagemagic ****" && \
+ IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
+	| grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' \
+	| sed 's/^.*ImageMagick-/ImageMagick-/') && \
+ mkdir -p \
+	/tmp/imagemagick && \
+ curl -o \
+ /tmp/imagemagick-src.tar.xz -L \
+	"http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \
+ tar xf \
+ /tmp/imagemagick-src.tar.xz -C \
+	/tmp/imagemagick --strip-components=1 && \
+ 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 && \
+ make && \
+ make install && \
+ find / -name '.packlist' -o -name 'perllocal.pod' \
+	-o -name '*.bs' -delete && \
+ echo "**** install calibre-web ****" && \
  mkdir -p \
 	/app/calibre-web && \
  curl -o \
@@ -32,8 +89,7 @@ RUN \
 	requirements.txt && \
  pip install --no-cache-dir -U -r \
 	optional-requirements.txt && \
-
-# cleanup
+ echo "**** cleanup ****" && \
  apk del --purge \
 	build-dependencies && \
  rm -rf \

README.md

@@ -3,7 +3,7 @@
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
 [appurl]: https://github.com/janeczku/calibre-web
-[hub]: https://hub.docker.com/r/example/example/
+[hub]: https://hub.docker.com/r/linuxserver/calibre-web/
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
@@ -94,8 +94,12 @@ To reverse proxy with our Letsencrypt docker container use the following locatio
 
 * image version number
 
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' calibre-web`
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/calibre-web`
 
 ## Versions
 
-+ **17.07.17:** Initial release
++ **05.01.18:** Deprecate cpu_core routine lack of scaling.
++ **06.12.17:** Rebase to alpine 3.7.
++ **27.11.17:** Use cpu core counting routine to speed up build time.
++ **24.07.17:** Curl version for imagemagick.
++ **17.07.17:** Initial release.

root/etc/cont-init.d/30-config

@@ -1,13 +1,21 @@
 #!/usr/bin/with-contenv bash
 
-# copy database to /config if not exists
-[[ ! -e /config/app.db ]] && \
-	cp /defaults/app.db /config/app.db \
-
-# create symlink for database
+# create symlinks for database and log
+[[ ! -f /config/app.db ]] && \
+	cp /defaults/app.db /config/app.db
+[[ -f /app/calibre-web/app.db ]] && \
+	rm /app/calibre-web/app.db
 [[ ! -L /app/calibre-web/app.db ]] && \
 	ln -s /config/app.db /app/calibre-web/app.db
 
+[[ ! -f /config/calibre-web.log ]] && \
+	touch /config/calibre-web.log
+[[ -f /app/calibre-web/calibre-web.log ]] && \
+	rm /app/calibre-web/calibre-web.log
+[[ ! -L /app/calibre-web/calibre-web.log ]] && \
+	ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log
+
+
 # permissions
 chown -R abc:abc \
 	/config \