Merge pull request #10 from linuxserver/3.7
bump to alpine 3.7 and fix continuation lines
This commit is contained in:
commit
0d3d473a7e
23
Dockerfile
23
Dockerfile
|
@ -1,13 +1,13 @@
|
||||||
FROM lsiobase/alpine.python:3.6
|
FROM lsiobase/alpine.python:3.7
|
||||||
MAINTAINER sparklyballs,chbmb
|
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
|
LABEL maintainer="chbmb"
|
||||||
|
|
||||||
# install build packages
|
|
||||||
RUN \
|
RUN \
|
||||||
|
echo "**** install build packages ****" && \
|
||||||
apk add --no-cache --virtual=build-dependencies \
|
apk add --no-cache --virtual=build-dependencies \
|
||||||
file \
|
file \
|
||||||
fontconfig-dev \
|
fontconfig-dev \
|
||||||
|
@ -21,14 +21,14 @@ RUN \
|
||||||
libtool \
|
libtool \
|
||||||
libwebp-dev \
|
libwebp-dev \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
libxslt-dev \
|
||||||
make \
|
make \
|
||||||
perl-dev \
|
perl-dev \
|
||||||
python2-dev \
|
python2-dev \
|
||||||
tiff-dev \
|
tiff-dev \
|
||||||
xz \
|
xz \
|
||||||
zlib-dev && \
|
zlib-dev && \
|
||||||
|
echo "**** install runtime packages ****" && \
|
||||||
# install runtime packages
|
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
fontconfig \
|
fontconfig \
|
||||||
freetype \
|
freetype \
|
||||||
|
@ -39,10 +39,10 @@ RUN \
|
||||||
libpng \
|
libpng \
|
||||||
libwebp \
|
libwebp \
|
||||||
libxml2 \
|
libxml2 \
|
||||||
|
libxslt \
|
||||||
tiff \
|
tiff \
|
||||||
zlib && \
|
zlib && \
|
||||||
|
echo "**** compile imagemagic ****" && \
|
||||||
# compile imagemagic
|
|
||||||
IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
|
IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \
|
||||||
| grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' \
|
| grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' \
|
||||||
| sed 's/^.*ImageMagick-/ImageMagick-/') && \
|
| sed 's/^.*ImageMagick-/ImageMagick-/') && \
|
||||||
|
@ -71,7 +71,7 @@ RUN \
|
||||||
--without-x \
|
--without-x \
|
||||||
--with-tiff \
|
--with-tiff \
|
||||||
--with-xml && \
|
--with-xml && \
|
||||||
# attempt to set number of cores available for make to use
|
echo "**** attempt to set number of cores available for make to use ****" && \
|
||||||
set -ex && \
|
set -ex && \
|
||||||
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
|
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
|
||||||
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
|
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
|
||||||
|
@ -83,14 +83,12 @@ RUN \
|
||||||
elif [ "$CPU_CORES" -gt 3 ]; then \
|
elif [ "$CPU_CORES" -gt 3 ]; then \
|
||||||
CPU_CORES=$(( CPU_CORES - 1 )); fi \
|
CPU_CORES=$(( CPU_CORES - 1 )); fi \
|
||||||
else CPU_CORES="1"; fi && \
|
else CPU_CORES="1"; fi && \
|
||||||
|
|
||||||
make -j $CPU_CORES && \
|
make -j $CPU_CORES && \
|
||||||
set +ex && \
|
set +ex && \
|
||||||
make install && \
|
make install && \
|
||||||
find / -name '.packlist' -o -name 'perllocal.pod' \
|
find / -name '.packlist' -o -name 'perllocal.pod' \
|
||||||
-o -name '*.bs' -delete && \
|
-o -name '*.bs' -delete && \
|
||||||
|
echo "**** install calibre-web ****" && \
|
||||||
# install calibre-web
|
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
/app/calibre-web && \
|
/app/calibre-web && \
|
||||||
curl -o \
|
curl -o \
|
||||||
|
@ -104,8 +102,7 @@ RUN \
|
||||||
requirements.txt && \
|
requirements.txt && \
|
||||||
pip install --no-cache-dir -U -r \
|
pip install --no-cache-dir -U -r \
|
||||||
optional-requirements.txt && \
|
optional-requirements.txt && \
|
||||||
|
echo "**** cleanup ****" && \
|
||||||
# cleanup
|
|
||||||
apk del --purge \
|
apk del --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
|
|
|
@ -98,6 +98,7 @@ To reverse proxy with our Letsencrypt docker container use the following locatio
|
||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
+ **06.12.17:** Rebase to alpine 3.7.
|
||||||
+ **27.11.17:** Use cpu core counting routine to speed up build time.
|
+ **27.11.17:** Use cpu core counting routine to speed up build time.
|
||||||
+ **24.07.17:** Curl version for imagemagick.
|
+ **24.07.17:** Curl version for imagemagick.
|
||||||
+ **17.07.17:** Initial release.
|
+ **17.07.17:** Initial release.
|
||||||
|
|
Loading…
Reference in New Issue