juergen/docker-oscam
1
0
Fork 0
Code Releases Activity

fix line endings, add /config VOLUME

Browse Source
This commit is contained in:
sparklyballs
2016-08-21 14:30:27 +01:00
parent 94c3b5d498
commit e5b8ee8bde
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile
View File

@ -2,7 +2,7 @@ FROM lsiobase/alpine
MAINTAINER saarg MAINTAINER saarg
# add runtime dependencies required for Oscam # add runtime dependencies required for Oscam
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
libcrypto1.0 \ libcrypto1.0 \
libssl1.0 \ libssl1.0 \
@ -10,7 +10,7 @@ RUN \
pcsc-lite \ pcsc-lite \
pcsc-lite-libs && \ pcsc-lite-libs && \
# add build time dependencies # add build time dependencies
apk add --no-cache --virtual=build-dependencies \ apk add --no-cache --virtual=build-dependencies \
curl \ curl \
gcc \ gcc \
@ -42,22 +42,22 @@ RUN \
NO_PLUS_TARGET=1 \ NO_PLUS_TARGET=1 \
CONF_DIR=/config \ CONF_DIR=/config \
DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \ DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \
pcsc-libusb && \ pcsc-libusb && \
# fix broken permissions from pcscd install. # fix broken permissions from pcscd install.
chown root:root \ chown root:root \
/usr/sbin/pcscd && \ /usr/sbin/pcscd && \
chmod 755 \ chmod 755 \
/usr/sbin/pcscd && \ /usr/sbin/pcscd && \
# install PCSC drivers for OmniKey devices # install PCSC drivers for OmniKey devices
mkdir -p \ mkdir -p \
/tmp/omnikey && \ /tmp/omnikey && \
curl -o \ curl -o \
/tmp/omnikey.tar.gz -L \ /tmp/omnikey.tar.gz -L \
https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \ 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 && \ /tmp/omnikey --strip-components=2 && \
cd /tmp/omnikey && \ cd /tmp/omnikey && \
./install && \ ./install && \
@ -69,7 +69,6 @@ RUN \
# cleanup # cleanup
apk del --purge \ apk del --purge \
build-dependencies && \ build-dependencies && \
rm -rf \ rm -rf \
/tmp/* /tmp/*
@ -78,3 +77,4 @@ COPY root/ /
# Ports and volumes # Ports and volumes
EXPOSE 8888 EXPOSE 8888
VOLUME /config

2
root/etc/services.d/pcscd/run
View File

@ -1,3 +1,3 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
exec \ exec \
s6-setuidgid root /usr/sbin/pcscd -f s6-setuidgid root /usr/sbin/pcscd -f