Update version to 1.1 in config.yaml

Remove untested architecture statuses from README.

hpessa/Dockerfile

@@ -19,12 +19,8 @@ RUN ( \
     && luarocks install lua-resty-http \
     )
 
-RUN ( \
-	curl https://downloads.linux.hpe.com/SDR/hpePublicKey2048_key1.pub | apt-key add - && \
-        ( echo "deb http://downloads.linux.HPE.com/SDR/repo/mcp/ bullseye/current non-free" > /etc/apt/sources.list.d/proliant.sources.list ) && \
-        apt-get update && \
-        apt-get install -y ssa \
-    )
+COPY ssa-5.30-6.0_amd64.deb /ssa_amd64.deb
+RUN apt-get install -y /ssa_amd64.deb
 
 COPY rootfs /
 # Corrects permissions

hpessa/config.yaml

@@ -1,5 +1,5 @@
 name: HPE Smart Storage Administrator
-version: '1'
+version: '1.1'
 slug: hpessa
 description: >-
   HPE Smart Storage Administrator (HPE SSA) offers a single interface that

oscam/Dockerfile

@@ -1,93 +1,12 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base:12.2.7
+ARG BUILD_FROM=lscr.io/linuxserver/oscam:latest
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
-ARG OSCAM_VERSION
-
-RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    libdvbcsa-dev \
-    libusb-dev \
-    linux-headers \
-    openssl-dev \
-    pcsc-lite-dev \
-    shadow && \
-  echo "**** install runtime packages ****" && \
-  apk add --no-cache \
-    ccid \
-    libdvbcsa \
-    openssl \
-    libusb \
-    pcsc-lite \
-    pcsc-lite-libs && \
-  echo "**** compile oscam ****" && \
-  if [ -z ${OSCAM_VERSION+x} ]; then \
-    OSCAM_VERSION=$(curl -s https://git.streamboard.tv/api/v4/projects/11/repository/tags | jq -r '.[0].name'); \
-  fi && \
-  mkdir -p /tmp/oscam && \
-  curl -o \
-    /tmp/oscam.tar.gz -L \
-    "https://git.streamboard.tv/common/oscam/-/archive/${OSCAM_VERSION}/oscam-${OSCAM_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/oscam.tar.gz -C \
-    /tmp/oscam --strip-components=1 && \
-  cd /tmp/oscam && \
-  ./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 && \
-  echo "**** fix broken permissions from pcscd install ****" && \
-  chmod 755 \
-    /usr/sbin/pcscd && \
-  echo "**** install PCSC drivers ****" && \
-  mkdir -p \
-    /tmp/omnikey && \
-  curl -o \
-  /tmp/omnikey.tar.gz -L \
-    "https://raw.githubusercontent.com/d-two/hassio-addons/main/oscam/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \
-  tar xzf \
-  /tmp/omnikey.tar.gz -C \
-    /tmp/omnikey --strip-components=2 && \
-  cd /tmp/omnikey && \
-  ./install && \
-  echo "**** create abc user and make our folders ****" && \
-  groupmod -g 1000 users && \
-  useradd -u 911 -U -d /config -s /bin/false abc && \
-  usermod -G users abc && \
-  echo "**** fix group for card readers and add abc to dialout group ****" && \
-  groupmod -g 24 cron && \
-  groupmod -g 16 dialout && \
-  usermod -a -G 16 abc && \
-  echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
-  rm -rf \
-    /tmp/*
-
 # copy local files
 COPY root/ /
 
-RUN \
-  chmod a+x /etc/cont-init.d/30-config && \
-  chmod a+x /etc/services.d/pcscd/run && \
-  chmod a+x /etc/services.d/oscam/run
-    
+RUN chmod a+x /etc/s6-overlay/s6-rc.d/svc-oscam/run
+
 # Ports and volumes
 EXPOSE 8888
 EXPOSE 9999

oscam/build.yaml

@@ -0,0 +1,4 @@
+---
+build_from:
+  aarch64: lscr.io/linuxserver/oscam:latest
+  amd64: lscr.io/linuxserver/oscam:latest

oscam/config.json

@@ -1,24 +0,0 @@
-{
-  "name": "OSCAM",
-  "version": "1.0",
-  "slug": "oscam",
-  "description": "This add-on allows you to have a OSCAM-Server.",
-  "arch": ["armv7", "aarch64", "amd64"],
-  "startup": "application",
-  "webui": "http://[HOST]:[PORT:8888]",
-  "boot": "auto",
-  "init": false,
-  "uart": true,
-  "ports": {
-    "8888/tcp": 8888,
-    "9999/tcp": 9999
-  },
-  "ports_description": {
-    "8888/tcp": "Web Interface",
-    "9999/tcp": "OSCAM Server"
-  },
-  "map": [
-    "config:rw"
-  ],
-  "hassio_role": "default"
-}

oscam/config.yaml

@@ -0,0 +1,22 @@
+name: OSCAM
+version: 1.1
+slug: oscam
+description: This add-on allows you to have a OSCAM-Server.
+arch:
+  - armv7
+  - aarch64
+  - amd64
+startup: application
+webui: 'http://[HOST]:[PORT:8888]'
+boot: auto
+init: false
+uart: true
+ports:
+  8888/tcp: 8888
+  9999/tcp: 9999
+ports_description:
+  8888/tcp: Web Interface
+  9999/tcp: OSCAM Server
+map:
+  - 'config:rw'
+hassio_role: default

oscam/root/defaults/oscam.conf

@@ -1,12 +0,0 @@
-# oscam.conf generated automatically by Streamboard OSCAM 1.20-unstable_svn SVN r11268
-# Read more: http://www.streamboard.tv/svn/oscam/trunk/Distribution/doc/txt/oscam.conf.txt
-
-[global]
-logfile                       = stdout
-
-[cache]
-
-
-[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

oscam/root/etc/cont-init.d/30-config

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make folders
-mkdir -p /config/oscam
-
-# copy config
-[[ ! -e /config/oscam/oscam.conf ]] && cp /defaults/oscam.conf /config/oscam/oscam.conf
-
-# permissions
-chown -R abc:abc /config

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

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

oscam/root/etc/services.d/oscam/run

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

oscam/root/etc/services.d/pcscd/run

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

ps3netsrv/README.md

@@ -13,10 +13,7 @@ The architectures supported by this image are:
 | Architecture | Status |
 | :----: | ------ |
 | x86-64 | working |
-| x86 | untested |
 | arm64 | working |
-| armv7 |  untested |
-| armhf | untested |
 
 ## Quick Start
 

ps3netsrv/build.yaml

@@ -1,7 +1,4 @@
 ---
 build_from:
-  armhf: ghcr.io/hassio-addons/base:13.0.0
-  armv7: ghcr.io/hassio-addons/base:13.0.0
   aarch64: ghcr.io/hassio-addons/base:13.0.0
   amd64: ghcr.io/hassio-addons/base:13.0.0
-  i386: ghcr.io/hassio-addons/base:13.0.0