Merge pull request #7 from linuxserver/new_source

New source

Dockerfile

@@ -1,8 +1,26 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.6
 MAINTAINER saarg
 
-# install runtime packages
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+
+# install build packages
 RUN \
+ apk add --no-cache --virtual=build-dependencies \
+	bzr \
+	curl \
+	gcc \
+	g++ \
+	libusb-dev \
+	linux-headers \
+	make \
+	libressl-dev \
+	pcsc-lite-dev \
+	tar && \
+
+# install runtime packages
  apk add --no-cache \
 	libcrypto1.0 \
 	libssl1.0 \
@@ -10,39 +28,26 @@ RUN \
 	pcsc-lite \
 	pcsc-lite-libs && \
 
-# install build packages
- apk add --no-cache --virtual=build-dependencies \
-	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 && \
+ bzr branch lp:oscam /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 && \
+	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" \
+	NO_PLUS_TARGET=1 \
+	OSCAM_BIN=/usr/bin/oscam \
 	pcsc-libusb && \
 
 # fix broken permissions from pcscd install.
@@ -57,7 +62,8 @@ RUN \
  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 && \

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/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/)
-[hub]: https://hub.docker.com/r/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][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]
-[oscamurl]: http://www.streamboard.tv/oscam/
+[![oscam](http://download.oscam.cc/images/Logo.png)][appurl]
 
 ## 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
@@ -84,7 +90,19 @@ The web interface is at port 8888.
 * Shell access whilst the container is running: `docker exec -it oscam /bin/bash`
 * To monitor the logs of the container in realtime: `docker logs -f oscam`
 
+* container version number 
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' oscam`
+
+* image version number
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/oscam`
+
 ## Versions
 
++ **17.10.2017:** Switch to using bzr for source code, streamboard awol.
++ **28.05.2017:** Rebase to alpine 3.6.
++ **09.02.2017:** Rebase to alpine 3.5.
++ **14.10.2016:** Add version layer information.
 + **02.10.2016:** Add info on passing through devices to README.
 + **25.09.2016:** Initial release.