diff --git a/Dockerfile b/Dockerfile index ab336da..8ffd4ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -78,6 +78,7 @@ RUN \ groupmod -g 24 cron && \ groupmod -g 16 dialout && \ usermod -a -G 16 abc && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1f404c9..f7b1790 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -78,6 +78,7 @@ RUN \ groupmod -g 24 cron && \ groupmod -g 16 dialout && \ usermod -a -G 16 abc && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index a9d1ee0..861a339 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { CI_PORT='8888' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 6d0b1a1..de6818c 100644 --- a/README.md +++ b/README.md @@ -298,6 +298,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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. * **27.08.23:** - Rebase to Alpine 3.18. Pull PCSC driver from Linuxserver S3 due to Cloudflare blocking curl download of original file. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f174dd2..89744c0 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -22,6 +22,6 @@ repo_vars: - CI_PORT='8888' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 33090c9..e9223d6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,20 +6,13 @@ project_url: "https://git.streamboard.tv/common/oscam" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/oscam-logo.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is an Open Source Conditional Access Module software used for descrambling DVB transmissions using smart cards. It's both a server and a client." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # supported architectures available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false -param_usage_include_env: true -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/{{ project_name }}/data", desc: "Where oscam should store config files and logs."} @@ -29,7 +22,6 @@ param_ports: param_device_map: true param_devices: - {device_path: "/dev/ttyUSB0", device_host_path: "/dev/ttyUSB0", desc: "For passing through smart card readers."} -cap_add_param: false # optional container parameters optional_block_1: true optional_block_1_items: @@ -61,6 +53,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: "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."} - {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."}