Merge pull request #9 from linuxserver/3.7

bump to alpine 3.7 and fix continuation lines

Dockerfile

@@ -1,22 +1,15 @@
-FROM lsiobase/alpine:3.5
+FROM lsiobase/alpine:3.7
-MAINTAINER saarg
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="saarg"
 
-# install runtime packages
 RUN \
- apk add --no-cache \
+ echo "**** install build packages ****" && \
-	libcrypto1.0 \
-	libssl1.0 \
-	libusb \
-	pcsc-lite \
-	pcsc-lite-libs && \
-
-# install build packages
  apk add --no-cache --virtual=build-dependencies \
+	bzr \
 	curl \
 	gcc \
 	g++ \
@@ -25,54 +18,70 @@ RUN \
 	make \
 	libressl-dev \
 	pcsc-lite-dev \
-	subversion \
 	tar && \
-
+ echo "**** install runtime packages ****" && \
-# compile oscam from source
+ apk add --no-cache \
- svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \
+	ccid \
+	libcrypto1.0 \
+	libssl1.0 \
+	libusb \
+	pcsc-lite \
+	pcsc-lite-libs && \
+ echo "**** compile oscam ****" && \
+ bzr branch lp:oscam /tmp/oscam-svn && \
  cd /tmp/oscam-svn && \
  ./config.sh \
 	--enable all \
 	--disable \
-		CARDREADER_DB2COM \
+	CARDREADER_DB2COM \
-		CARDREADER_INTERNAL \
+	CARDREADER_INTERNAL \
-		CARDREADER_STINGER \
+	CARDREADER_STINGER \
-		CARDREADER_STAPI \
+	CARDREADER_STAPI \
-		CARDREADER_STAPI5 \
+	CARDREADER_STAPI5 \
-		IPV6SUPPORT \
+	IPV6SUPPORT \
-		LCDSUPPORT \
+	LCDSUPPORT \
-		LEDSUPPORT \
+	LEDSUPPORT \
-		READ_SDT_CHARSETS && \
+	READ_SDT_CHARSETS && \
- make \
+  echo "**** attempt to set number of cores available for make to use ****" && \
-	OSCAM_BIN=/usr/bin/oscam \
+ set -ex && \
-	NO_PLUS_TARGET=1 \
+ 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 \
 	DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
+	NO_PLUS_TARGET=1 \
+	OSCAM_BIN=/usr/bin/oscam \
 	pcsc-libusb && \
-
+ set +ex && \
-# fix broken permissions from pcscd install.
+ echo "**** fix broken permissions from pcscd install ****" && \
  chown root:root \
 	/usr/sbin/pcscd && \
  chmod 755 \
 	/usr/sbin/pcscd && \
-
+ echo "**** install PCSC drivers ****" && \
-# install PCSC drivers for OmniKey devices
  mkdir -p \
 	/tmp/omnikey && \
  curl -o \
  /tmp/omnikey.tar.gz -L \
 	https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
- tar xzf /tmp/omnikey.tar.gz -C \
+ tar xzf \
+ /tmp/omnikey.tar.gz -C \
 	/tmp/omnikey --strip-components=2 && \
  cd /tmp/omnikey && \
  ./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 16 dialout && \
  usermod -a -G 16 abc && \
-
+ echo "**** cleanup ****" && \
-# cleanup
  apk del --purge \
 	build-dependencies && \
  rm -rf \

README.md

@@ -13,7 +13,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
 # linuxserver/oscam
-[![](https://images.microbadger.com/badges/version/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/oscam.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/oscam.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io/linuxserver-oscam)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io/job/linuxserver-oscam/)
+[![](https://images.microbadger.com/badges/version/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/oscam.svg)](https://microbadger.com/images/linuxserver/oscam "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/oscam.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/oscam.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-oscam)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-oscam/)
 
 [Oscam][appurl] is an Open Source Conditional Access Module software used for descrambling DVB transmissions using smart cards. It's both a server and a client.
 
@@ -100,7 +100,11 @@ The web interface is at port 8888.
 
 ## Versions
 
-+ **09.02.2017:** Rebase to alpine 3.5.
++ **13.12.17:** Rebase to alpine 3.7.
-+ **14.10.2016:** Add version layer information.
++ **19.10.17:** Add ccid package for usb card readers.
-+ **02.10.2016:** Add info on passing through devices to README.
++ **17.10.17:** Switch to using bzr for source code, streamboard awol.
-+ **25.09.2016:** Initial release.
++ **28.05.17:** Rebase to alpine 3.6.
++ **09.02.17:** Rebase to alpine 3.5.
++ **14.10.16:** Add version layer information.
++ **02.10.16:** Add info on passing through devices to README.
++ **25.09.16:** Initial release.