mirror of
https://github.com/linuxserver/docker-oscam.git
synced 2026-02-20 02:14:10 +08:00
Merge pull request #33 from linuxserver/3.15
This commit is contained in:
commit
09cbb98210
142
Dockerfile
142
Dockerfile
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.11
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -8,80 +8,80 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="saarg"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
bzr \
|
||||
curl \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
ccid \
|
||||
libcrypto1.1 \
|
||||
libssl1.1 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
echo "**** compile oscam ****" && \
|
||||
if [ -z ${OSCAM_VERSION+x} ]; then \
|
||||
OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
|
||||
fi && \
|
||||
svn checkout http://www.streamboard.tv/svn/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
|
||||
cd /tmp/oscam-svn && \
|
||||
./config.sh \
|
||||
--enable all \
|
||||
--disable \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
echo "**** install PCSC drivers ****" && \
|
||||
mkdir -p \
|
||||
/tmp/omnikey && \
|
||||
curl -o \
|
||||
/tmp/omnikey.tar.gz -L \
|
||||
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
echo "**** fix group for card readers and add abc to dialout group ****" && \
|
||||
groupmod -g 24 cron && \
|
||||
groupmod -g 16 dialout && \
|
||||
usermod -a -G 16 abc && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
ccid \
|
||||
curl \
|
||||
libcrypto1.1 \
|
||||
libssl1.1 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
echo "**** compile oscam ****" && \
|
||||
if [ -z ${OSCAM_VERSION+x} ]; then \
|
||||
OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
|
||||
fi && \
|
||||
svn checkout https://svn.streamboard.tv/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
|
||||
cd /tmp/oscam-svn && \
|
||||
./config.sh \
|
||||
--enable all \
|
||||
--disable \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
echo "**** install PCSC drivers ****" && \
|
||||
mkdir -p \
|
||||
/tmp/omnikey && \
|
||||
curl -o \
|
||||
/tmp/omnikey.tar.gz -L \
|
||||
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
echo "**** fix group for card readers and add abc to dialout group ****" && \
|
||||
groupmod -g 24 cron && \
|
||||
groupmod -g 16 dialout && \
|
||||
usermod -a -G 16 abc && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
|
||||
# copy local files
|
||||
COPY root/ /
|
||||
|
||||
# Ports and volumes
|
||||
EXPOSE 8888
|
||||
|
||||
VOLUME /config
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.11
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -8,80 +8,80 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="saarg"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
bzr \
|
||||
curl \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
ccid \
|
||||
libcrypto1.1 \
|
||||
libssl1.1 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
echo "**** compile oscam ****" && \
|
||||
if [ -z ${OSCAM_VERSION+x} ]; then \
|
||||
OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
|
||||
fi && \
|
||||
svn checkout http://www.streamboard.tv/svn/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
|
||||
cd /tmp/oscam-svn && \
|
||||
./config.sh \
|
||||
--enable all \
|
||||
--disable \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
echo "**** install PCSC drivers ****" && \
|
||||
mkdir -p \
|
||||
/tmp/omnikey && \
|
||||
curl -o \
|
||||
/tmp/omnikey.tar.gz -L \
|
||||
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
echo "**** fix group for card readers and add abc to dialout group ****" && \
|
||||
groupmod -g 24 cron && \
|
||||
groupmod -g 16 dialout && \
|
||||
usermod -a -G 16 abc && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
ccid \
|
||||
curl \
|
||||
libcrypto1.1 \
|
||||
libssl1.1 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
echo "**** compile oscam ****" && \
|
||||
if [ -z ${OSCAM_VERSION+x} ]; then \
|
||||
OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
|
||||
fi && \
|
||||
svn checkout https://svn.streamboard.tv/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
|
||||
cd /tmp/oscam-svn && \
|
||||
./config.sh \
|
||||
--enable all \
|
||||
--disable \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
echo "**** install PCSC drivers ****" && \
|
||||
mkdir -p \
|
||||
/tmp/omnikey && \
|
||||
curl -o \
|
||||
/tmp/omnikey.tar.gz -L \
|
||||
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
echo "**** fix group for card readers and add abc to dialout group ****" && \
|
||||
groupmod -g 24 cron && \
|
||||
groupmod -g 16 dialout && \
|
||||
usermod -a -G 16 abc && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
|
||||
# copy local files
|
||||
COPY root/ /
|
||||
|
||||
# Ports and volumes
|
||||
EXPOSE 8888
|
||||
|
||||
VOLUME /config
|
||||
|
||||
142
Dockerfile.armhf
142
Dockerfile.armhf
@ -1,4 +1,4 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.11
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -8,80 +8,80 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||
LABEL maintainer="saarg"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
bzr \
|
||||
curl \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
ccid \
|
||||
libcrypto1.1 \
|
||||
libssl1.1 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
echo "**** compile oscam ****" && \
|
||||
if [ -z ${OSCAM_VERSION+x} ]; then \
|
||||
OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
|
||||
fi && \
|
||||
svn checkout http://www.streamboard.tv/svn/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
|
||||
cd /tmp/oscam-svn && \
|
||||
./config.sh \
|
||||
--enable all \
|
||||
--disable \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
echo "**** install PCSC drivers ****" && \
|
||||
mkdir -p \
|
||||
/tmp/omnikey && \
|
||||
curl -o \
|
||||
/tmp/omnikey.tar.gz -L \
|
||||
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
echo "**** fix group for card readers and add abc to dialout group ****" && \
|
||||
groupmod -g 24 cron && \
|
||||
groupmod -g 16 dialout && \
|
||||
usermod -a -G 16 abc && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
ccid \
|
||||
curl \
|
||||
libcrypto1.1 \
|
||||
libssl1.1 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
echo "**** compile oscam ****" && \
|
||||
if [ -z ${OSCAM_VERSION+x} ]; then \
|
||||
OSCAM_VERSION=$(svn info --show-item revision https://svn.streamboard.tv/oscam/trunk ); \
|
||||
fi && \
|
||||
svn checkout https://svn.streamboard.tv/oscam/trunk@${OSCAM_VERSION} /tmp/oscam-svn && \
|
||||
cd /tmp/oscam-svn && \
|
||||
./config.sh \
|
||||
--enable all \
|
||||
--disable \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
echo "**** install PCSC drivers ****" && \
|
||||
mkdir -p \
|
||||
/tmp/omnikey && \
|
||||
curl -o \
|
||||
/tmp/omnikey.tar.gz -L \
|
||||
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
echo "**** fix group for card readers and add abc to dialout group ****" && \
|
||||
groupmod -g 24 cron && \
|
||||
groupmod -g 16 dialout && \
|
||||
usermod -a -G 16 abc && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
|
||||
# copy local files
|
||||
COPY root/ /
|
||||
|
||||
# Ports and volumes
|
||||
EXPOSE 8888
|
||||
|
||||
VOLUME /config
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# jenkins variables
|
||||
project_name: docker-oscam
|
||||
external_type: na
|
||||
custom_version_command: "docker run --rm alpine:3.9 sh -c 'apk add subversion > /dev/null 2>&1 && svn info --show-item revision https://svn.streamboard.tv/oscam/trunk'"
|
||||
custom_version_command: "docker run --rm alpine:latest sh -c 'apk add -U --update --no-cache subversion > /dev/null 2>&1 && svn info --show-item revision https://svn.streamboard.tv/oscam/trunk'"
|
||||
release_type: stable
|
||||
release_tag: latest
|
||||
ls_branch: master
|
||||
|
||||
@ -26,7 +26,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/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" }
|
||||
@ -73,6 +73,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "19.12.19:", desc: "Rebasing to alpine 3.15." }
|
||||
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
|
||||
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
|
||||
- { date: "29.04.19:", desc: "Add revision check, so pipeline can build new revisions." }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user