rebase to ubuntu bionic

Merge pull request #10 from linuxserver/deprecate_cpu_core
deprecate cpu_core routine lack of scaling
2018-08-21 18:55:03 +01:00 · 2018-01-03 20:13:07 +00:00 · 2018-01-03 09:37:25 +00:00 · 2017-12-16 18:21:50 +00:00 · 2017-12-13 15:30:12 +00:00 · 2017-10-19 17:12:58 +03:00
2 changed files with 75 additions and 71 deletions
--- a/130
+++ b/130
@ -1,85 +1,85 @@
-FROM lsiobase/alpine:3.6
-MAINTAINER saarg
+FROM lsiobase/ubuntu:bionic as buildstage
+############## 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 build packages
 RUN \
- apk add --no-cache --virtual=build-dependencies \
-	curl \
-	gcc \
-	g++ \
-	libusb-dev \
-	linux-headers \
-	make \
-	libressl-dev \
-	pcsc-lite-dev \
-	subversion \
-	tar && \
-
-# install runtime packages
- apk add --no-cache \
-	libcrypto1.0 \
-	libssl1.0 \
-	libusb \
-	pcsc-lite \
-	pcsc-lite-libs && \
-
-
-# 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
+ echo "**** install runtime packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+	libccid \
+	libpcsclite1 \
+	libusb-1.0-0 \
+	pcscd \
+	udev && \
+ echo "**** install PCSC drivers ****" && \
 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 && \
-
-# 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 && \
+ echo "**** cleanup ****" && \
 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
--- a/README.md
+++ b/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,8 +100,12 @@ The web interface is at port 8888.

 ## Versions

-+ **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.
+ **03.01.18:** Deprecate cpu_core routine lack of scaling.
+ **13.12.17:** Rebase to alpine 3.7.
+ **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.
Author	SHA1	Message	Date
sparklyballs	cb181bae0e	rebase to ubuntu bionic	2018-08-21 18:55:03 +01:00
sparklyballs	12785b1711	Merge pull request #10 from linuxserver/deprecate_cpu_core deprecate cpu_core routine lack of scaling	2018-01-03 20:13:07 +00:00
sparklyballs	548e6e1cf7	deprecate cpu_core routine lack of scaling	2018-01-03 09:37:25 +00:00
sparklyballs	9c7d852c19	Merge pull request #9 from linuxserver/3.7 bump to alpine 3.7 and fix continuation lines	2017-12-16 18:21:50 +00:00
sparklyballs	d09999bb98	bump to alpine 3.7 and fix continuation lines	2017-12-13 15:30:12 +00:00
aptalca	fa339bcc4d	Merge pull request #8 from bibene/master add card reader driver package	2017-10-19 17:12:58 +03:00
Ivo Martinsons	aef729f7c2	add card reader driver package update version history	2017-10-19 15:31:54 +03:00
Ivo Martinsons	95ef84a777	add card reader driver package changes after review	2017-10-19 15:30:10 +03:00
Ivo Martinsons	bc850b20aa	add card reader driver package My card reader "ID 08e6:3437 Gemalto (was Gemplus) GemPC Twin SmartCard Reader" was not working due to missing driver, adding package ccid solves this. It also includes drivers for many other readers.	2017-10-19 13:52:37 +03:00
j0nnymoe	3e2ad3cdff	Merge pull request #7 from linuxserver/new_source New source	2017-10-17 11:16:21 +01:00
sparklyballs	3c372e7836	switch from svn to bzr for source, streamboard currently awol	2017-10-17 10:40:31 +01:00
sparklyballs	84de5b1894	switch from svn to bzr for source, streamboard currently awol	2017-10-17 10:30:44 +01:00
sparklyballs	bae428a8a3	update of README with badges for new ci	2017-07-12 06:47:09 +01:00