Rebase to 3.17

This commit is contained in:
TheSpad
2023-03-13 19:29:23 +00:00
parent 73a86485ae
commit bfee102c99
13 changed files with 30 additions and 41 deletions

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -10,21 +12,15 @@ LABEL maintainer="saarg"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
gcc \ build-base \
g++ \
libusb-dev \ libusb-dev \
linux-headers \ linux-headers \
make \
openssl-dev \ openssl-dev \
pcsc-lite-dev \ pcsc-lite-dev \
subversion \ subversion && \
tar && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache \
ccid \ ccid \
curl \
libcrypto1.1 \
libssl1.1 \
libusb \ libusb \
pcsc-lite \ pcsc-lite \
pcsc-lite-libs && \ pcsc-lite-libs && \

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -10,21 +12,15 @@ LABEL maintainer="saarg"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
gcc \ build-base \
g++ \
libusb-dev \ libusb-dev \
linux-headers \ linux-headers \
make \
openssl-dev \ openssl-dev \
pcsc-lite-dev \ pcsc-lite-dev \
subversion \ subversion && \
tar && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache \
ccid \ ccid \
curl \
libcrypto1.1 \
libssl1.1 \
libusb \ libusb \
pcsc-lite \ pcsc-lite \
pcsc-lite-libs && \ pcsc-lite-libs && \

View File

@@ -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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -10,21 +12,15 @@ LABEL maintainer="saarg"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
gcc \ build-base \
g++ \
libusb-dev \ libusb-dev \
linux-headers \ linux-headers \
make \
openssl-dev \ openssl-dev \
pcsc-lite-dev \ pcsc-lite-dev \
subversion \ subversion && \
tar && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apk add --no-cache \
ccid \ ccid \
curl \
libcrypto1.1 \
libssl1.1 \
libusb \ libusb \
pcsc-lite \ pcsc-lite \
pcsc-lite-libs && \ pcsc-lite-libs && \

View File

@@ -61,7 +61,7 @@ The architectures supported by this image are:
## Application Setup ## Application Setup
To set up oscam there are numerous guides on the internet. There are too many scenarios to make a quick guide. 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 ## Usage
@@ -248,6 +248,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **13.03.23:** - Rebase to Alpine 3.17.
* **03.11.22:** - Rebasing to alpine 3.16 and s6v3. Update pcsd driver link. * **03.11.22:** - Rebasing to alpine 3.16 and s6v3. Update pcsd driver link.
* **13.02.22:** - Rebasing to alpine 3.15. * **13.02.22:** - Rebasing to alpine 3.15.
* **19.12.19:** - Rebasing to alpine 3.11. * **19.12.19:** - Rebasing to alpine 3.11.

View File

@@ -36,11 +36,6 @@ param_devices:
cap_add_param: false cap_add_param: false
# optional container parameters # 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: true
optional_block_1_items: optional_block_1_items:
- | - |
@@ -69,10 +64,11 @@ optional_block_1_items:
app_setup_block_enabled: true app_setup_block_enabled: true
app_setup_block: | app_setup_block: |
To set up oscam there are numerous guides on the internet. There are too many scenarios to make a quick guide. 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 # changelog
changelogs: 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: "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: "13.02.22:", desc: "Rebasing to alpine 3.15." }
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }

View File

@@ -1,13 +1,15 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash
# make folders # make folders
mkdir -p \ mkdir -p \
/config/oscam /config/oscam
# copy config # copy config
[[ ! -e /config/oscam/oscam.conf ]] && \ if [[ ! -e /config/oscam/oscam.conf ]]; then
cp /defaults/oscam.conf /config/oscam/oscam.conf cp /defaults/oscam.conf /config/oscam/oscam.conf
fi
# permissions # permissions
chown -R abc:abc \ lsiown -R abc:abc \
/config /config

View File

@@ -1 +1 @@
oneshot oneshot

View File

@@ -1 +1 @@
/etc/s6-overlay/s6-rc.d/init-oscam-config/run /etc/s6-overlay/s6-rc.d/init-oscam-config/run

View File

@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash
exec \ exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \

View File

@@ -1 +1 @@
longrun longrun

View File

@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# shellcheck shell=bash
exec \ exec \
/usr/sbin/pcscd -f /usr/sbin/pcscd -f

View File

@@ -1 +1 @@
longrun longrun