Compare commits
55 Commits
35
...
11574-ls22
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
084891318e | ||
|
|
5ece96dcfd | ||
|
|
e7d5c3c756 | ||
|
|
705c5eeffc | ||
|
|
67c63b8842 | ||
|
|
0f1d7f29e0 | ||
|
|
c0dd2a5232 | ||
|
|
316c4283b4 | ||
|
|
b5e8040748 | ||
|
|
848b11dade | ||
|
|
63fc03f9c0 | ||
|
|
31cea8f308 | ||
|
|
048b99cfc6 | ||
|
|
0c37ccb33e | ||
|
|
c1510593cf | ||
|
|
f1e107edf7 | ||
|
|
77fe5fc024 | ||
|
|
7c037b8f07 | ||
|
|
099ee6d0f6 | ||
|
|
188fde4900 | ||
|
|
35332826f3 | ||
|
|
721c377cf8 | ||
|
|
5c3c63e1c0 | ||
|
|
32fc863244 | ||
|
|
3da60fa559 | ||
|
|
02b4c12dc1 | ||
|
|
9e9470eab5 | ||
|
|
fb2c75179c | ||
|
|
1cafe3e38b | ||
|
|
9beff939fe | ||
|
|
ce79a74de0 | ||
|
|
22d3d9f323 | ||
|
|
9e04fd2a5b | ||
|
|
20a2cd5860 | ||
|
|
ba977cc7a0 | ||
|
|
8046d7e097 | ||
|
|
9a849d2273 | ||
|
|
087ee7e179 | ||
|
|
6ac759e9b8 | ||
|
|
3fa2093712 | ||
|
|
63adf950ec | ||
|
|
12785b1711 | ||
|
|
548e6e1cf7 | ||
|
|
9c7d852c19 | ||
|
|
d09999bb98 | ||
|
|
fa339bcc4d | ||
|
|
aef729f7c2 | ||
|
|
95ef84a777 | ||
|
|
bc850b20aa | ||
|
|
3e2ad3cdff | ||
|
|
3c372e7836 | ||
|
|
84de5b1894 | ||
|
|
bae428a8a3 | ||
|
|
0e91e3adee | ||
|
|
d317624ea5 |
1
.github/FUNDING.yml
vendored
Executable file
1
.github/FUNDING.yml
vendored
Executable file
@@ -0,0 +1 @@
|
||||
open_collective: linuxserver
|
||||
37
.github/ISSUE_TEMPLATE.md
vendored
37
.github/ISSUE_TEMPLATE.md
vendored
@@ -1,21 +1,34 @@
|
||||
<!--- Provide a general summary of the issue in the Title above -->
|
||||
|
||||
[linuxserverurl]: https://linuxserver.io
|
||||
[][linuxserverurl]
|
||||
|
||||
|
||||
<!--- If you have an issue with the project, please provide us with the following information -->
|
||||
If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support.
|
||||
|
||||
<!--- Host OS -->
|
||||
<!--- Command line users, your run/create command, GUI/Unraid users, a screenshot of your template settings. -->
|
||||
<!--- Docker log output, docker log <container-name> -->
|
||||
<!--- Mention if you're using symlinks on any of the volume mounts. -->
|
||||
<!--- Provide a general summary of the issue in the Title above -->
|
||||
|
||||
------------------------------
|
||||
|
||||
<!--- If you have a suggestion or fix for the project, please provide us with the following information -->
|
||||
## Expected Behavior
|
||||
<!--- Tell us what should happen -->
|
||||
|
||||
<!--- What you think your suggestion brings to the project, or fixes with the project -->
|
||||
<!--- If it's a fix, would it be better suited as a Pull request to the repo ? -->
|
||||
## Current Behavior
|
||||
<!--- Tell us what happens instead of the expected behavior -->
|
||||
|
||||
## Thanks, team linuxserver.io
|
||||
## Steps to Reproduce
|
||||
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
|
||||
<!--- reproduce this bug. Include code to reproduce, if relevant -->
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
4.
|
||||
|
||||
## Environment
|
||||
**OS:**
|
||||
**CPU architecture:** x86_64/arm32/arm64
|
||||
**How docker service was installed:**
|
||||
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
|
||||
|
||||
## Command used to create docker container (run/create/compose/screenshot)
|
||||
<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
|
||||
|
||||
## Docker logs
|
||||
<!--- Provide a full docker log, output of "docker logs oscam" -->
|
||||
|
||||
30
.github/PULL_REQUEST_TEMPLATE.md
vendored
30
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -6,10 +6,34 @@
|
||||
|
||||
<!--- Before submitting a pull request please check the following -->
|
||||
|
||||
<!--- That you have made a branch in your fork, we'd rather not merge from your master -->
|
||||
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
|
||||
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
||||
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
||||
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
||||
<!--- -->
|
||||
<!--- We maintain a changelog of major revisions to the container at the end of readme-vars.yml in the root of this repository, please add your changes there if appropriate -->
|
||||
|
||||
## Thanks, team linuxserver.io
|
||||
|
||||
<!--- Coding guidelines: -->
|
||||
<!--- 1. Installed packages in the Dockerfiles should be in alphabetical order -->
|
||||
<!--- 2. Changes to Dockerfile should be replicated in Dockerfile.armhf and Dockerfile.aarch64 if applicable -->
|
||||
<!--- 3. Indentation style (tabs vs 4 spaces vs 1 space) should match the rest of the document -->
|
||||
<!--- 4. Readme is auto generated from readme-vars.yml, make your changes there -->
|
||||
|
||||
------------------------------
|
||||
|
||||
We welcome all PR’s though this doesn’t guarantee it will be accepted.
|
||||
|
||||
## Description:
|
||||
<!--- Describe your changes in detail -->
|
||||
|
||||
## Benefits of this PR and context:
|
||||
<!--- Please explain why we should accept this PR. If this fixes an outstanding bug, please reference the issue # -->
|
||||
|
||||
## How Has This Been Tested?
|
||||
<!--- Please describe in detail how you tested your changes. -->
|
||||
<!--- Include details of your testing environment, and the tests you ran to -->
|
||||
<!--- see how your change affects other areas of the code, etc. -->
|
||||
|
||||
|
||||
## Source / References:
|
||||
<!--- Please include any forum posts/github links relevant to the PR -->
|
||||
|
||||
71
Dockerfile
71
Dockerfile
@@ -1,78 +1,79 @@
|
||||
FROM lsiobase/alpine:3.5
|
||||
MAINTAINER saarg
|
||||
FROM lsiobase/alpine:3.11
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG OSCAM_VERSION
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="saarg"
|
||||
|
||||
# install runtime packages
|
||||
RUN \
|
||||
apk add --no-cache \
|
||||
libcrypto1.0 \
|
||||
libssl1.0 \
|
||||
libusb \
|
||||
pcsc-lite \
|
||||
pcsc-lite-libs && \
|
||||
|
||||
# install build packages
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
bzr \
|
||||
curl \
|
||||
gcc \
|
||||
g++ \
|
||||
libusb-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
libressl-dev \
|
||||
openssl-dev \
|
||||
pcsc-lite-dev \
|
||||
subversion \
|
||||
tar && \
|
||||
|
||||
# compile oscam from source
|
||||
svn checkout http://www.streamboard.tv/svn/oscam/trunk /tmp/oscam-svn && \
|
||||
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 http://www.streamboard.tv/svn/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 && \
|
||||
CARDREADER_DB2COM \
|
||||
CARDREADER_INTERNAL \
|
||||
CARDREADER_STINGER \
|
||||
CARDREADER_STAPI \
|
||||
CARDREADER_STAPI5 \
|
||||
IPV6SUPPORT \
|
||||
LCDSUPPORT \
|
||||
LEDSUPPORT \
|
||||
READ_SDT_CHARSETS && \
|
||||
make \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
NO_PLUS_TARGET=1 \
|
||||
CONF_DIR=/config \
|
||||
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
|
||||
NO_PLUS_TARGET=1 \
|
||||
OSCAM_BIN=/usr/bin/oscam \
|
||||
pcsc-libusb && \
|
||||
|
||||
# fix broken permissions from pcscd install.
|
||||
echo "**** fix broken permissions from pcscd install ****" && \
|
||||
chown root:root \
|
||||
/usr/sbin/pcscd && \
|
||||
chmod 755 \
|
||||
/usr/sbin/pcscd && \
|
||||
|
||||
# install PCSC drivers for OmniKey devices
|
||||
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 \
|
||||
tar xzf \
|
||||
/tmp/omnikey.tar.gz -C \
|
||||
/tmp/omnikey --strip-components=2 && \
|
||||
cd /tmp/omnikey && \
|
||||
./install && \
|
||||
|
||||
# fix group for card readers and add abc to dialout group
|
||||
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 && \
|
||||
|
||||
# cleanup
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
rm -rf \
|
||||
|
||||
87
Dockerfile.aarch64
Normal file
87
Dockerfile.aarch64
Normal file
@@ -0,0 +1,87 @@
|
||||
FROM lsiobase/alpine:arm64v8-3.11
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG OSCAM_VERSION
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
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 \
|
||||
| ||||