From 23c5efe3532cf4d3d56cab347bdb40c563b0dd88 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 15 Jan 2026 18:56:50 -0500 Subject: [PATCH] rebase to alpine 3.23, add wiki submodule support --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/FUNDING.yml | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/external_trigger.yml | 0 .github/workflows/external_trigger_scheduler.yml | 0 .github/workflows/greetings.yml | 0 .github/workflows/package_trigger_scheduler.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 15 +++++++-------- Dockerfile.aarch64 | 15 +++++++-------- LICENSE | 0 README.md | 1 + readme-vars.yml | 1 + 18 files changed, 16 insertions(+), 16 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/FUNDING.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/external_trigger.yml mode change 100755 => 100644 .github/workflows/external_trigger_scheduler.yml mode change 100755 => 100644 .github/workflows/greetings.yml mode change 100755 => 100644 .github/workflows/package_trigger_scheduler.yml mode change 100755 => 100644 .github/workflows/permissions.yml mode change 100755 => 100644 LICENSE diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index bbb032e..ea6229e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:3.23 # set version label ARG BUILD_DATE @@ -16,6 +16,7 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ + git \ libdvbcsa-dev \ libusb-dev \ linux-headers \ @@ -33,13 +34,11 @@ RUN \ 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 && \ + git clone \ + --branch "${OSCAM_VERSION}" \ + --depth 1 \ + https://git.streamboard.tv/common/oscam \ + /tmp/oscam && \ cd /tmp/oscam && \ ./config.sh \ --enable all \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 225fc1f..6887ec2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 # set version label ARG BUILD_DATE @@ -16,6 +16,7 @@ RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ build-base \ + git \ libdvbcsa-dev \ libusb-dev \ linux-headers \ @@ -33,13 +34,11 @@ RUN \ 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 && \ + git clone \ + --branch "${OSCAM_VERSION}" \ + --depth 1 \ + https://git.streamboard.tv/common/oscam \ + /tmp/oscam && \ cd /tmp/oscam && \ ./config.sh \ --enable all \ diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 75405bb..ca89e7c 100644 --- a/README.md +++ b/README.md @@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.01.26:** - Rebase to Alpine 3.23, add support for wiki submodule. * **27.06.24:** - Rebase to Alpine 3.20. * **19.04.24:** - Retrieve Oscam from the new git repo. * **04.03.24:** - Rebase to Alpine 3.19. Add libdvbcsa. diff --git a/readme-vars.yml b/readme-vars.yml index 614dac0..1a67eec 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ init_diagram: | "oscam:latest" <- Base Images # changelog changelogs: + - {date: "15.01.26:", desc: "Rebase to Alpine 3.23, add support for wiki submodule."} - {date: "27.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "19.04.24:", desc: "Retrieve Oscam from the new git repo."} - {date: "04.03.24:", desc: "Rebase to Alpine 3.19. Add libdvbcsa."}