Skip to content
This repository has been archived by the owner on Feb 21, 2019. It is now read-only.

bump_alpine_3.7 #3

Merged
merged 1 commit into from
Jan 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM lsiobase/alpine.python.arm64:3.6
MAINTAINER sparklyballs,chbmb
FROM lsiobase/alpine.python.arm64: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 \
Expand All @@ -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 \
Expand All @@ -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-/') && \
Expand Down Expand Up @@ -71,26 +71,11 @@ RUN \
--without-x \
--with-tiff \
--with-xml && \
# attempt to set number of cores available for make to use
set -ex && \
CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
if echo $CPU_CORES | grep -E -q '^[0-9]+$'; then \
: ;\
if [ "$CPU_CORES" -gt 7 ]; then \
CPU_CORES=$(( CPU_CORES - 3 )); \
elif [ "$CPU_CORES" -gt 5 ]; then \
CPU_CORES=$(( CPU_CORES - 2 )); \
elif [ "$CPU_CORES" -gt 3 ]; then \
CPU_CORES=$(( CPU_CORES - 1 )); fi \
else CPU_CORES="1"; fi && \

make -j $CPU_CORES && \
set +ex && \
make && \
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 \
Expand All @@ -104,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 \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ To reverse proxy with our Letsencrypt docker container use the following locatio

## Versions

+ **05.01.18:** Rebase to alpine 3.7, Deprecate cpu_core routine lack of scaling.
+ **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