Update Dockerfile

Fix download omnikey driver

baikal/Dockerfile

@@ -5,26 +5,26 @@ FROM ${BUILD_FROM}
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-ENV VERSION 0.9.3
+ENV VERSION 0.10.1
 
 # Setup base
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        nginx=1.22.1-r0 \
-        php8-curl=8.0.26-r0 \
-        php8-fpm=8.0.26-r0 \
-        php8-mbstring=8.0.26-r0 \
-        php8-xml=8.0.26-r0 \
-        php8=8.0.26-r0 \
-		php8-sqlite3=8.0.26-r0 \
-		php8-pdo=8.0.26-r0 \
-		php8-pdo_mysql=8.0.26-r0 \
-		php8-pdo_sqlite=8.0.26-r0 \
-		php8-session=8.0.26-r0 \
-		php8-dom=8.0.26-r0 \
-		php8-xmlreader=8.0.26-r0 \
-		php8-xmlwriter=8.0.26-r0 \
+        nginx \
+        php81-curl \
+        php81-fpm \
+        php81-mbstring \
+        php81-xml \
+        php81 \
+	php81-sqlite3 \
+	php81-pdo \
+	php81-pdo_mysql \
+	php81-pdo_sqlite \
+	php81-session \
+	php81-dom \
+	php81-xmlreader \
+	php81-xmlwriter \
     \
     && curl -Ls "https://github.com/sabre-io/Baikal/releases/download/$VERSION/baikal-$VERSION.zip" -o baikal-$VERSION.zip \
         && unzip -q baikal-$VERSION.zip -d /var/www/ \

baikal/config.yaml

@@ -1,10 +1,10 @@
 ---
 name: Baikal
 slug: baikal
-version: 0.9.3
+version: 0.10.1
 description: Baikal is a Cal and CardDAV server, based on sabre/dav, that includes an administrative interface for easy management.
 url: https://github.com/d-two/hassio-addons
-startup: application
+startup: services
 init: false
 webui: "[PROTO:ssl]://[HOST]:[PORT:80]"
 arch:

baikal/rootfs/etc/services.d/php-fpm/run

@@ -5,4 +5,4 @@
 # ==============================================================================
 bashio::log.info "Starting PHP-FPM..."
 
-exec php-fpm8 --nodaemonize
+exec php-fpm81 --nodaemonize

oscam/Dockerfile

@@ -7,31 +7,33 @@ ARG OSCAM_VERSION
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    gcc \
-    g++ \
+    build-base \
+    libdvbcsa-dev \
     libusb-dev \
     linux-headers \
-    make \
     openssl-dev \
     pcsc-lite-dev \
-    subversion \
-    tar \
     shadow && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     ccid \
-    curl \
-    libcrypto1.1 \
-    libssl1.1 \
+    libdvbcsa \
+    openssl \
     libusb \
     pcsc-lite \
     pcsc-lite-libs && \
   echo "**** compile oscam ****" && \
   if [ -z ${OSCAM_VERSION+x} ]; then \
-    OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
+    OSCAM_VERSION=$(curl -s https://git.streamboard.tv/api/v4/projects/11/repository/tags | jq -r '.[0].name'); \
   fi && \
-  svn checkout https://svn.streamboard.tv/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
-  cd /tmp/oscam-svn && \
+  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 \
@@ -58,7 +60,7 @@ RUN \
     /tmp/omnikey && \
   curl -o \
   /tmp/omnikey.tar.gz -L \
-    "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \
+    "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 && \

oscam/config.json

@@ -5,6 +5,7 @@
   "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,

ps3netsrv/Dockerfile

@@ -65,6 +65,7 @@ RUN \
 COPY rootfs/ /
 
 # Corrects permissions for s6 v3
+RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi
 RUN if [ -d /etc/s6-overlay ]; then chmod -R 755 /etc/s6-overlay; fi
 
 # Build arguments

ps3netsrv/README.md

@@ -20,7 +20,10 @@ The architectures supported by this image are:
 
 ## Quick Start
 
-  - coming soon
+  cifsdomain: workgroup (optional)
+  cifspassword: password
+  cifsusername: username
+  networkdisks: //192.168.137.100/path/to/games
 
 ### Ports
 

ps3netsrv/config.yaml

@@ -1,7 +1,7 @@
 ---
 name: Ps3NetServer
 slug: ps3netserver
-version: 0.1.0-NAS
+version: 0.1.3-NAS
 description: This is a Docker container for ps3netsrv (or ps3netsvr).
 url: https://github.com/d-two/hassio-addons/tree/main/ps3netsrv
 startup: application
@@ -22,6 +22,6 @@ privileged:
 - DAC_READ_SEARCH
 schema:
   cifsdomain: str?
-  cifspassword: str?
-  cifsusername: str?
-  networkdisks: str?
+  cifspassword: str
+  cifsusername: str
+  networkdisks: str

ps3netsrv/rootfs/etc/s6-overlay/s6-rc.d/ps3netsrv/run

@@ -5,5 +5,29 @@
 # Runs the ps3netsrv
 # ==============================================================================
 
-bashio::log.info "Starting Ps3NetSrv.... (Share)"
-exec ps3netsrv /mnt/Share
+if bashio::config.has_value 'networkdisks'; then
+
+    # Define variables
+    MOREDISKS=$(bashio::config 'networkdisks')
+
+    # Clean data
+    MOREDISKS=${MOREDISKS// \/\//,\/\/}
+    MOREDISKS=${MOREDISKS//, /,}
+    MOREDISKS=${MOREDISKS// /"\040"}
+
+    # Mounting disks
+    # shellcheck disable=SC2086
+    for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+
+        # Clean name of network share
+        # shellcheck disable=SC2116,SC2001
+        disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+        disk="${disk//"\040"/ }"            #replace \040 with
+        diskname="${disk//\\//}"            #replace \ with /
+        diskname="${diskname##*/}"          # Get only last part of the name
+
+        bashio::log.info "Starting Ps3NetSrv.... ($diskname)"
+        exec ps3netsrv /mnt/"$diskname"
+        break
+    done
+fi