Compare commits

...

7 Commits
27 ... 52

Author SHA1 Message Date
sparklyballs fec0a1c28f Merge pull request #11 from linuxserver/deprecate_cpu_core
deprecate cpu_core routine lack of scaling
2018-01-05 19:31:01 +00:00
sparklyballs eeb3e9bb22 deprecate cpu_core routine lack of scaling 2018-01-05 17:09:16 +00:00
sparklyballs 0d3d473a7e Merge pull request #10 from linuxserver/3.7
bump to alpine 3.7 and fix continuation lines
2017-12-17 00:15:35 +00:00
sparklyballs ef46a9a195 configure workaround no longer required 2017-12-09 00:50:11 +00:00
sparklyballs 6bc7f90c50 bump to alpine 3.7 and fix continuation lines 2017-12-06 19:12:27 +00:00
sparklyballs 879514949c Merge pull request #9 from linuxserver/cpu_cores
use cpu core routine
2017-11-29 13:46:24 +00:00
sparklyballs c33a1ce348 use cpu core routine 2017-11-27 18:10:22 +00:00
2 changed files with 12 additions and 11 deletions
+9 -11
View File
@@ -1,13 +1,13 @@
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 \
@@ -21,14 +21,14 @@ RUN \
libtool \
libwebp-dev \
libxml2-dev \
libxslt-dev \
make \
perl-dev \
python2-dev \
tiff-dev \
xz \
zlib-dev && \
# install runtime packages
echo "**** install runtime packages ****" && \
apk add --no-cache \
fontconfig \
freetype \
@@ -39,10 +39,10 @@ RUN \
libpng \
libwebp \
libxml2 \
libxslt \
tiff \
zlib && \
# compile imagemagic
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-/') && \
@@ -75,8 +75,7 @@ RUN \
make install && \
find / -name '.packlist' -o -name 'perllocal.pod' \
-o -name '*.bs' -delete && \
# install calibre-web
echo "**** install calibre-web ****" && \
mkdir -p \
/app/calibre-web && \
curl -o \
@@ -90,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 \
+3
View File
@@ -98,5 +98,8 @@ To reverse proxy with our Letsencrypt docker container use the following locatio
## Versions
+ **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.