From d4d4fedbd3e072d0b1cfe679ab174d6832109d3d Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 4 Mar 2024 12:57:31 -0500
Subject: [PATCH] rebase to 3.19, add new dep `libdvbcsa`

---
 Dockerfile         | 4 +++-
 Dockerfile.aarch64 | 4 +++-
 README.md          | 5 +++--
 readme-vars.yml    | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 25f4dcb..a3c7035 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 
 # set version label
 ARG BUILD_DATE
@@ -13,6 +13,7 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
+    libdvbcsa-dev \
     libusb-dev \
     linux-headers \
     openssl-dev \
@@ -21,6 +22,7 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     ccid \
+    libdvbcsa \
     libusb \
     pcsc-lite \
     pcsc-lite-libs && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 208c67f..f2fd802 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
@@ -13,6 +13,7 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
+    libdvbcsa-dev \
     libusb-dev \
     linux-headers \
     openssl-dev \
@@ -21,6 +22,7 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     ccid \
+    libdvbcsa \
     libusb \
     pcsc-lite \
     pcsc-lite-libs && \
diff --git a/README.md b/README.md
index 30470a6..7c5ac2f 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - /path/to/data:/config
+      - /path/to/oscam/data:/config
     ports:
       - 8888:8888
     devices:
@@ -96,7 +96,7 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
   -p 8888:8888 \
-  -v /path/to/data:/config \
+  -v /path/to/oscam/data:/config \
   --device /dev/ttyUSB0:/dev/ttyUSB0 \
   --restart unless-stopped \
   lscr.io/linuxserver/oscam:latest
@@ -298,6 +298,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.03.24:** - Rebase to Alpine 3.19. Add libdvbcsa.
 * **27.08.23:** - Rebase to Alpine 3.18. Pull PCSC driver from Linuxserver S3 due to Cloudflare blocking curl download of original file.
 * **07.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **13.03.23:** - Rebase to Alpine 3.17.
diff --git a/readme-vars.yml b/readme-vars.yml
index 029e7fd..3562a3c 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -22,7 +22,7 @@ param_env_vars:
   - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where oscam should store config files and logs."}
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Where oscam should store config files and logs."}
 param_usage_include_ports: true
 param_ports:
   - {external_port: "8888", internal_port: "8888", port_desc: "WebUI"}
@@ -61,6 +61,7 @@ app_setup_block: |
   The web interface is at port 8888. You can find the project wiki [here](https://trac.streamboard.tv/oscam/).
 # changelog
 changelogs:
+  - {date: "04.03.24:", desc: "Rebase to Alpine 3.19. Add libdvbcsa."}
   - {date: "27.08.23:", desc: "Rebase to Alpine 3.18. Pull PCSC driver from Linuxserver S3 due to Cloudflare blocking curl download of original file."}
   - {date: "07.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "13.03.23:", desc: "Rebase to Alpine 3.17."}