Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebase to 3.19, add new dep libdvbcsa #41

Merged
merged 1 commit into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -21,6 +22,7 @@ RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
ccid \
libdvbcsa \
libusb \
pcsc-lite \
pcsc-lite-libs && \
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -21,6 +22,7 @@ RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
ccid \
libdvbcsa \
libusb \
pcsc-lite \
pcsc-lite-libs && \
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ services:
- PGID=1000
- TZ=Etc/UTC
volumes:
- /path/to/data:/config
- /path/to/oscam/data:/config
ports:
- 8888:8888
devices:
Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down Expand Up @@ -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."}
Expand Down