Merge pull request #35 from linuxserver/3.16

rebase oscam to 3.16, upgrade to s6v3, update pcsd driver download link

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -61,10 +61,10 @@ RUN \
   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 && \
+    /tmp/omnikey.tar.gz -L \
+    "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \
   tar xzf \
-  /tmp/omnikey.tar.gz -C \
+    /tmp/omnikey.tar.gz -C \
     /tmp/omnikey --strip-components=2 && \
   cd /tmp/omnikey && \
   ./install && \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -61,10 +61,10 @@ RUN \
   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 && \
+    /tmp/omnikey.tar.gz -L \
+    "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \
   tar xzf \
-  /tmp/omnikey.tar.gz -C \
+    /tmp/omnikey.tar.gz -C \
     /tmp/omnikey --strip-components=2 && \
   cd /tmp/omnikey && \
   ./install && \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -61,10 +61,10 @@ RUN \
   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 && \
+    /tmp/omnikey.tar.gz -L \
+    "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \
   tar xzf \
-  /tmp/omnikey.tar.gz -C \
+    /tmp/omnikey.tar.gz -C \
     /tmp/omnikey --strip-components=2 && \
   cd /tmp/omnikey && \
   ./install && \

readme-vars.yml

@@ -73,7 +73,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "19.12.19:", desc: "Rebasing to alpine 3.15." }
+  - { date: "03.11.22:", desc: "Rebasing to alpine 3.16 and s6v3. Update pcsd driver link." }
+  - { date: "13.02.22:", desc: "Rebasing to alpine 3.15." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "29.04.19:", desc: "Add revision check, so pipeline can build new revisions." }

root/defaults/oscam.conf

@@ -9,4 +9,4 @@ logfile                       = stdout
 
 [webif]
 httpport                      = 8888
-httpallowed                   = 127.0.0.1,192.168.0.0-192.168.255.255,10.0.0.0-10.255.255.255,255.255.255.255
+httpallowed                   = 127.0.0.1,172.16.0.0-172.31.255.255,192.168.0.0-192.168.255.255,10.0.0.0-10.255.255.255,255.255.255.255

root/etc/s6-overlay/s6-rc.d/init-oscam-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-oscam-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-oscam-config/run

root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-oscam/run

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \
+        s6-setuidgid abc /usr/bin/oscam -c /config/oscam

root/etc/s6-overlay/s6-rc.d/svc-oscam/type

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/svc-pcsd/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    /usr/sbin/pcscd -f

root/etc/s6-overlay/s6-rc.d/svc-pcsd/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/oscam/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-exec \
-	s6-setuidgid abc /usr/bin/oscam -c /config/oscam

root/etc/services.d/pcscd/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-exec \
-	s6-setuidgid root /usr/sbin/pcscd -f