From bfee102c99bbf3e3e3e6729e982b73fec4285f05 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 13 Mar 2023 19:29:23 +0000 Subject: [PATCH] Rebase to 3.17 --- Dockerfile | 14 +++++--------- Dockerfile.aarch64 | 14 +++++--------- Dockerfile.armhf | 14 +++++--------- README.md | 3 ++- readme-vars.yml | 8 ++------ root/etc/s6-overlay/s6-rc.d/init-oscam-config/run | 6 ++++-- root/etc/s6-overlay/s6-rc.d/init-oscam-config/type | 2 +- root/etc/s6-overlay/s6-rc.d/init-oscam-config/up | 2 +- .../s6-overlay/s6-rc.d/svc-oscam/notification-fd | 2 +- root/etc/s6-overlay/s6-rc.d/svc-oscam/run | 1 + root/etc/s6-overlay/s6-rc.d/svc-oscam/type | 2 +- root/etc/s6-overlay/s6-rc.d/svc-pcsd/run | 1 + root/etc/s6-overlay/s6-rc.d/svc-pcsd/type | 2 +- 13 files changed, 30 insertions(+), 41 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b10ac1..ae16453 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 # set version label ARG BUILD_DATE @@ -10,21 +12,15 @@ LABEL maintainer="saarg" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - gcc \ - g++ \ + build-base \ libusb-dev \ linux-headers \ - make \ openssl-dev \ pcsc-lite-dev \ - subversion \ - tar && \ + subversion && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ ccid \ - curl \ - libcrypto1.1 \ - libssl1.1 \ libusb \ pcsc-lite \ pcsc-lite-libs && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0b6e1b7..dbf4c39 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 # set version label ARG BUILD_DATE @@ -10,21 +12,15 @@ LABEL maintainer="saarg" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - gcc \ - g++ \ + build-base \ libusb-dev \ linux-headers \ - make \ openssl-dev \ pcsc-lite-dev \ - subversion \ - tar && \ + subversion && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ ccid \ - curl \ - libcrypto1.1 \ - libssl1.1 \ libusb \ pcsc-lite \ pcsc-lite-libs && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 49aea9f..881db46 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 # set version label ARG BUILD_DATE @@ -10,21 +12,15 @@ LABEL maintainer="saarg" RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - gcc \ - g++ \ + build-base \ libusb-dev \ linux-headers \ - make \ openssl-dev \ pcsc-lite-dev \ - subversion \ - tar && \ + subversion && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ ccid \ - curl \ - libcrypto1.1 \ - libssl1.1 \ libusb \ pcsc-lite \ pcsc-lite-libs && \ diff --git a/README.md b/README.md index f50ce59..2851a7f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The architectures supported by this image are: ## Application Setup To set up oscam there are numerous guides on the internet. There are too many scenarios to make a quick guide. -The web interface is at port 8888. +The web interface is at port 8888. You can find the project wiki [here](https://trac.streamboard.tv/oscam/). ## Usage @@ -248,6 +248,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.03.23:** - Rebase to Alpine 3.17. * **03.11.22:** - Rebasing to alpine 3.16 and s6v3. Update pcsd driver link. * **13.02.22:** - Rebasing to alpine 3.15. * **19.12.19:** - Rebasing to alpine 3.11. diff --git a/readme-vars.yml b/readme-vars.yml index 6b92446..fd777f7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -36,11 +36,6 @@ param_devices: cap_add_param: false # optional container parameters -opt_param_usage_include_env: false -opt_param_usage_include_vols: false -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false optional_block_1: true optional_block_1_items: - | @@ -69,10 +64,11 @@ optional_block_1_items: app_setup_block_enabled: true app_setup_block: | To set up oscam there are numerous guides on the internet. There are too many scenarios to make a quick guide. - The web interface is at port 8888. + The web interface is at port 8888. You can find the project wiki [here](https://trac.streamboard.tv/oscam/). # changelog changelogs: + - { date: "13.03.23:", desc: "Rebase to Alpine 3.17." } - { 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." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/run b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/run index 799ace0..2504a7a 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/run @@ -1,13 +1,15 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash # make folders mkdir -p \ /config/oscam # copy config -[[ ! -e /config/oscam/oscam.conf ]] && \ +if [[ ! -e /config/oscam/oscam.conf ]]; then cp /defaults/oscam.conf /config/oscam/oscam.conf +fi # permissions -chown -R abc:abc \ +lsiown -R abc:abc \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type index 3d92b15..bdd22a1 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type +++ b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up index af01702..b401a78 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up +++ b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/init-oscam-config/run \ No newline at end of file +/etc/s6-overlay/s6-rc.d/init-oscam-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd index e440e5c..00750ed 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd +++ b/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd @@ -1 +1 @@ -3 \ No newline at end of file +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/run b/root/etc/s6-overlay/s6-rc.d/svc-oscam/run index 6c1f92b..ad392df 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-oscam/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-oscam/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/type b/root/etc/s6-overlay/s6-rc.d/svc-oscam/type index 1780f9f..5883cff 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-oscam/type +++ b/root/etc/s6-overlay/s6-rc.d/svc-oscam/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run index a1e0d49..f6eba8c 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash exec \ /usr/sbin/pcscd -f diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type index 1780f9f..5883cff 100644 --- a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type +++ b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun