From e5b8ee8bdee238d3a08323c97d091a807a250210 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sun, 21 Aug 2016 14:30:27 +0100 Subject: [PATCH] fix line endings, add /config VOLUME --- Dockerfile | 18 +++++++++--------- root/etc/services.d/pcscd/run | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba68550..0f75ec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM lsiobase/alpine MAINTAINER saarg # add runtime dependencies required for Oscam -RUN \ +RUN \ apk add --no-cache \ libcrypto1.0 \ libssl1.0 \ @@ -10,7 +10,7 @@ RUN \ pcsc-lite \ pcsc-lite-libs && \ -# add build time dependencies +# add build time dependencies apk add --no-cache --virtual=build-dependencies \ curl \ gcc \ @@ -42,22 +42,22 @@ RUN \ NO_PLUS_TARGET=1 \ CONF_DIR=/config \ DEFAULT_PCSC_FLAGS="-I/usr/include/PCSC" \ - pcsc-libusb && \ - + pcsc-libusb && \ + # fix broken permissions from pcscd install. chown root:root \ - /usr/sbin/pcscd && \ + /usr/sbin/pcscd && \ chmod 755 \ - /usr/sbin/pcscd && \ + /usr/sbin/pcscd && \ # install PCSC drivers for OmniKey devices 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 && \ + 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 && \ + /tmp/omnikey --strip-components=2 && \ cd /tmp/omnikey && \ ./install && \ @@ -69,7 +69,6 @@ RUN \ # cleanup apk del --purge \ build-dependencies && \ - rm -rf \ /tmp/* @@ -78,3 +77,4 @@ COPY root/ / # Ports and volumes EXPOSE 8888 +VOLUME /config diff --git a/root/etc/services.d/pcscd/run b/root/etc/services.d/pcscd/run index 7a9a65e..c4e0632 100644 --- a/root/etc/services.d/pcscd/run +++ b/root/etc/services.d/pcscd/run @@ -1,3 +1,3 @@ #!/usr/bin/with-contenv bash exec \ - s6-setuidgid root /usr/sbin/pcscd -f + s6-setuidgid root /usr/sbin/pcscd -f