rebase to ubuntu bionic

deprecate cpu_core routine lack of scaling

Dockerfile

@@ -1,36 +1,25 @@
-FROM lsiobase/alpine:3.6
+FROM lsiobase/ubuntu:bionic as buildstage
-MAINTAINER saarg
+############## build stage ##############
 
-# set version label
+# environment settings
-ARG BUILD_DATE
+ARG DEBIAN_FRONTEND="noninteractive"
-ARG VERSION
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 
-# install build packages
 RUN \
- apk add --no-cache --virtual=build-dependencies \
+ echo "**** install build packages ****" && \
+ apt-get update && \
+ apt-get install -y \
+	build-essential \
 	bzr \
-	curl \
+	libpcsclite-dev \
-	gcc \
+	libssl-dev \
-	g++ \
+	libusb-1.0-0-dev
-	libusb-dev \
-	linux-headers \
-	make \
-	libressl-dev \
-	pcsc-lite-dev \
-	tar && \
 
-# install runtime packages
+RUN \
- apk add --no-cache \
+ echo "**** fetch oscam source ****" && \
-	ccid \
+ bzr branch lp:oscam /tmp/oscam-svn
-	libcrypto1.0 \
-	libssl1.0 \
-	libusb \
-	pcsc-lite \
-	pcsc-lite-libs && \
 
-# compile oscam from source
+RUN \
- bzr branch lp:oscam /tmp/oscam-svn && \
+ echo "**** compile oscam ****" && \
  cd /tmp/oscam-svn && \
  ./config.sh \
 	--enable all \
@@ -49,15 +38,29 @@ RUN \
 	DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
 	NO_PLUS_TARGET=1 \
 	OSCAM_BIN=/usr/bin/oscam \
-	pcsc-libusb && \
+	pcsc-libusb
+############## runtime stage ##############
+FROM lsiobase/ubuntu:bionic
 
-# fix broken permissions from pcscd install.
+# set version label
- chown root:root \
+ARG BUILD_DATE
-	/usr/sbin/pcscd && \
+ARG VERSION
- chmod 755 \
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-	/usr/sbin/pcscd && \
+LABEL maintainer="saarg"
 
-# install PCSC drivers for OmniKey devices
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+
+RUN \
+ 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 \
@@ -68,19 +71,15 @@ RUN \
 	/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

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