1
0

bump to alpine 3.7 and fix continuation lines

This commit is contained in:
sparklyballs
2017-12-13 15:30:12 +00:00
parent fa339bcc4d
commit d09999bb98
2 changed files with 31 additions and 23 deletions

View File

@ -1,13 +1,13 @@
FROM lsiobase/alpine:3.6 FROM lsiobase/alpine:3.7
MAINTAINER saarg
# 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="saarg"
# install build packages
RUN \ RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
bzr \ bzr \
curl \ curl \
@ -19,8 +19,7 @@ RUN \
libressl-dev \ libressl-dev \
pcsc-lite-dev \ pcsc-lite-dev \
tar && \ tar && \
echo "**** install runtime packages ****" && \
# install runtime packages
apk add --no-cache \ apk add --no-cache \
ccid \ ccid \
libcrypto1.0 \ libcrypto1.0 \
@ -28,8 +27,7 @@ RUN \
libusb \ libusb \
pcsc-lite \ pcsc-lite \
pcsc-lite-libs && \ pcsc-lite-libs && \
echo "**** compile oscam ****" && \
# compile oscam from source
bzr branch lp:oscam /tmp/oscam-svn && \ bzr branch lp:oscam /tmp/oscam-svn && \
cd /tmp/oscam-svn && \ cd /tmp/oscam-svn && \
./config.sh \ ./config.sh \
@ -44,20 +42,31 @@ RUN \
LCDSUPPORT \ LCDSUPPORT \
LEDSUPPORT \ LEDSUPPORT \
READ_SDT_CHARSETS && \ READ_SDT_CHARSETS && \
make \ echo "**** 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 \
CONF_DIR=/config \ CONF_DIR=/config \
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \ DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
NO_PLUS_TARGET=1 \ NO_PLUS_TARGET=1 \
OSCAM_BIN=/usr/bin/oscam \ OSCAM_BIN=/usr/bin/oscam \
pcsc-libusb && \ pcsc-libusb && \
set +ex && \
# fix broken permissions from pcscd install. echo "**** fix broken permissions from pcscd install ****" && \
chown root:root \ chown root:root \
/usr/sbin/pcscd && \ /usr/sbin/pcscd && \
chmod 755 \ chmod 755 \
/usr/sbin/pcscd && \ /usr/sbin/pcscd && \
echo "**** install PCSC drivers ****" && \
# install PCSC drivers for OmniKey devices
mkdir -p \ mkdir -p \
/tmp/omnikey && \ /tmp/omnikey && \
curl -o \ curl -o \
@ -68,13 +77,11 @@ RUN \
/tmp/omnikey --strip-components=2 && \ /tmp/omnikey --strip-components=2 && \
cd /tmp/omnikey && \ cd /tmp/omnikey && \
./install && \ ./install && \
echo "**** fix group for card readers and add abc to dialout group ****" && \
# fix group for card readers and add abc to dialout group
groupmod -g 24 cron && \ groupmod -g 24 cron && \
groupmod -g 16 dialout && \ groupmod -g 16 dialout && \
usermod -a -G 16 abc && \ usermod -a -G 16 abc && \
echo "**** cleanup ****" && \
# cleanup
apk del --purge \ apk del --purge \
build-dependencies && \ build-dependencies && \
rm -rf \ rm -rf \

View File

@ -100,10 +100,11 @@ The web interface is at port 8888.
## Versions ## Versions
+ **19.10.2017:** Add ccid package for usb card readers. + **13.12.17:** Rebase to alpine 3.7.
+ **17.10.2017:** Switch to using bzr for source code, streamboard awol. + **19.10.17:** Add ccid package for usb card readers.
+ **28.05.2017:** Rebase to alpine 3.6. + **17.10.17:** Switch to using bzr for source code, streamboard awol.
+ **09.02.2017:** Rebase to alpine 3.5. + **28.05.17:** Rebase to alpine 3.6.
+ **14.10.2016:** Add version layer information. + **09.02.17:** Rebase to alpine 3.5.
+ **02.10.2016:** Add info on passing through devices to README. + **14.10.16:** Add version layer information.
+ **25.09.2016:** Initial release. + **02.10.16:** Add info on passing through devices to README.
+ **25.09.16:** Initial release.