diff --git a/Dockerfile b/Dockerfile index 786d96b..6f4efdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/mono +FROM lsiobase/xenial MAINTAINER saarg # package versions @@ -16,9 +16,15 @@ ENV HOME /config # install runtime dependencies RUN \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ + echo "deb http://download.mono-project.com/repo/ubuntu xenial main" | tee /etc/apt/sources.list.d/mono-official.list && \ apt-get update && \ apt-get install -y \ - cron && \ + cron \ + libmono-system-data4.0-cil \ + libmono-system-web4.0-cil \ + mono-runtime \ + unzip && \ # install webgrab WEBGRAB_BRANCH=${WEBGRAB_VER%.0} && \ diff --git a/root/defaults/wg-cron b/root/defaults/wg-cron index 36d2daa..03bf3e5 100644 --- a/root/defaults/wg-cron +++ b/root/defaults/wg-cron @@ -1 +1 @@ -2 3 * * * /defaults/update.sh +2 3 * * * s6-setuidgid abc /bin/bash /defaults/update.sh diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index b3ac100..d74ea4f 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -9,7 +9,7 @@ # add cron file for running webgrab+plus [[ ! -e /config/wg-cron ]] && \ cp /defaults/wg-cron /config/wg-cron -crontab -u abc /config/wg-cron +crontab /config/wg-cron # permissions chown -R abc:abc \ diff --git a/root/etc/services.d/cron/run b/root/etc/services.d/cron/run index ca85a24..791665d 100644 --- a/root/etc/services.d/cron/run +++ b/root/etc/services.d/cron/run @@ -1,3 +1,3 @@ #!/usr/bin/with-contenv bash -/usr/sbin/cron -f -L 0 +/usr/sbin/cron -f -L 1