rebase to ubuntu bionic

deprecate cpu_core routine lack of scaling

Dockerfile

@@ -1,84 +1,85 @@
-FROM lsiobase/alpine
+FROM lsiobase/ubuntu:bionic as buildstage
-MAINTAINER saarg
+############## build stage ##############
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+
+RUN \
+ echo "**** install build packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+	build-essential \
+	bzr \
+	libpcsclite-dev \
+	libssl-dev \
+	libusb-1.0-0-dev
+
+RUN \
+ echo "**** fetch oscam source ****" && \
+ bzr branch lp:oscam /tmp/oscam-svn
+
+RUN \
+ echo "**** compile oscam ****" && \
+ cd /tmp/oscam-svn && \
+ ./config.sh \
+	--enable all \
+	--disable \
+	CARDREADER_DB2COM \
+	CARDREADER_INTERNAL \
+	CARDREADER_STINGER \
+	CARDREADER_STAPI \
+	CARDREADER_STAPI5 \
+	IPV6SUPPORT \
+	LCDSUPPORT \
+	LEDSUPPORT \
+	READ_SDT_CHARSETS && \
+ make \
+	CONF_DIR=/config \
+	DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
+	NO_PLUS_TARGET=1 \
+	OSCAM_BIN=/usr/bin/oscam \
+	pcsc-libusb
+############## runtime stage ##############
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="saarg"
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
 
-# install runtime packages
 RUN \
- apk add --no-cache \
+ echo "**** install runtime packages ****" && \
-	libcrypto1.0 \
+ apt-get update && \
-	libssl1.0 \
+ apt-get install -y \
-	libusb \
+	libccid \
-	pcsc-lite \
+	libpcsclite1 \
-	pcsc-lite-libs && \
+	libusb-1.0-0 \
-
+	pcscd \
-# install build packages
+	udev && \
- apk add --no-cache --virtual=build-dependencies \
+ echo "**** install PCSC drivers ****" && \
-	curl \
-	gcc \
-	g++ \
-	libusb-dev \
-	linux-headers \
-	make \
-	openssl-dev \
-	pcsc-lite-dev \
-	subversion \
-	tar && \
-
-# compile oscam from source
- svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \
- cd /tmp/oscam-svn && \
- ./config.sh \
-	--enable all \
-	--disable \
-		CARDREADER_DB2COM \
-		CARDREADER_INTERNAL \
-		CARDREADER_STINGER \
-		CARDREADER_STAPI \
-		CARDREADER_STAPI5 \
-		IPV6SUPPORT \
-		LCDSUPPORT \
-		LEDSUPPORT \
-		READ_SDT_CHARSETS && \
- make \
-	OSCAM_BIN=/usr/bin/oscam \
-	NO_PLUS_TARGET=1 \
-	CONF_DIR=/config \
-	DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
-	pcsc-libusb && \
-
-# fix broken permissions from pcscd install.
- chown root:root \
-	/usr/sbin/pcscd && \
- chmod 755 \
-	/usr/sbin/pcscd && \
-
-# 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 "**** cleanup ****" && \
-# fix group for card readers and add abc to dialout group
- groupmod -g 24 cron && \
- groupmod -g 16 dialout && \
- usermod -a -G 16 abc && \
-
-# cleanup
- apk del --purge \
-	build-dependencies && \
  rm -rf \
-	/tmp/*
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
-# copy local files
+# copy buildstage and local files
+COPY --from=buildstage /usr/bin/oscam /usr/bin/
+COPY --from=buildstage /usr/bin/oscam.debug /usr/bin/
 COPY root/ /
 
 # Ports and volumes

README.md

@@ -2,6 +2,8 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: http://www.streamboard.tv/oscam/
+[hub]: https://hub.docker.com/r/linuxserver/oscam/
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
@@ -11,13 +13,11 @@ 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/)
-[hub]: https://hub.docker.com/r/linuxserver/oscam/
 
-[Oscam][oscamurl] is an Open Source Conditional Access Module software used for descrambling DVB transmissions using smart cards. It's both a server and a client.
+[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.
 
-[![oscam](http://download.oscam.cc/images/Logo.png)][oscamurl]
+[![oscam](http://download.oscam.cc/images/Logo.png)][appurl]
-[oscamurl]: http://www.streamboard.tv/oscam/
 
 ## Usage
 
@@ -31,7 +31,13 @@ docker create \
   linuxserver/oscam
 ```
 
-**Parameters**
+## Parameters
+
+`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
+For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
+So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
+http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
+
 
 * `-p 8888` - the port(s)
 * `-v /config` - where oscam should store config files and logs
@@ -94,6 +100,12 @@ The web interface is at port 8888.
 
 ## Versions
 
-+ **14-10-16:** Add version layer information.
++ **03.01.18:** Deprecate cpu_core routine lack of scaling.
-+ **02.10.2016:** Add info on passing through devices to README.
++ **13.12.17:** Rebase to alpine 3.7.
-+ **25.09.2016:** Initial release.
++ **19.10.17:** Add ccid package for usb card readers.
++ **17.10.17:** Switch to using bzr for source code, streamboard awol.
++ **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.