diff --git a/Dockerfile b/Dockerfile index 0b3693e..f40f76e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,45 +14,45 @@ ARG DEBIAN_FRONTEND="noninteractive" ENV HOME /config RUN \ - echo "**** add mono repository ****" && \ - apt-get update && \ - apt-get install -y \ - gnupg && \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ - echo "deb https://download.mono-project.com/repo/ubuntu focal main" | tee /etc/apt/sources.list.d/mono-official.list && \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y \ - cron \ - libmono-system-data4.0-cil \ - libmono-system-net-http-webrequest4.0-cil \ - libmono-system-web4.0-cil \ - mono-devel \ - mono-runtime \ - unzip && \ - echo "**** install webgrabplus ****" && \ - if [ -z "$WEBGRAB_VER" ]; then \ - WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \ - fi && \ - echo "Found Webgrabplus version ${WEBGRAB_VER}" && \ - WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \ - mkdir -p \ - /app/wg++ && \ - curl -o /tmp/wg++.tar.gz -L \ - "${WEBGRAB_URL}" && \ - tar xzf \ - /tmp/wg++.tar.gz -C \ - /app/wg++ --strip-components=1 && \ - echo "**** download siteini.pack ****" && \ - curl -o \ - /tmp/ini.zip -L \ - http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ - unzip -q /tmp/ini.zip -d /defaults/ini/ && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** add mono repository ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ + echo "deb https://download.mono-project.com/repo/ubuntu focal main" | tee /etc/apt/sources.list.d/mono-official.list && \ + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y \ + cron \ + libmono-system-data4.0-cil \ + libmono-system-net-http-webrequest4.0-cil \ + libmono-system-web4.0-cil \ + mono-devel \ + mono-runtime \ + unzip && \ + echo "**** install webgrabplus ****" && \ + if [ -z "$WEBGRAB_VER" ]; then \ + WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \ + fi && \ + echo "Found Webgrabplus version ${WEBGRAB_VER}" && \ + WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \ + mkdir -p \ + /app/wg++ && \ + curl -o /tmp/wg++.tar.gz -L \ + "${WEBGRAB_URL}" && \ + tar xzf \ + /tmp/wg++.tar.gz -C \ + /app/wg++ --strip-components=1 && \ + echo "**** download siteini.pack ****" && \ + curl -o \ + /tmp/ini.zip -L \ + http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ + unzip -q /tmp/ini.zip -d /defaults/ini/ && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # copy files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 56d0622..1684cdd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,45 +14,45 @@ ARG DEBIAN_FRONTEND="noninteractive" ENV HOME /config RUN \ - echo "**** add mono repository ****" && \ - apt-get update && \ - apt-get install -y \ - gnupg && \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ - echo "deb https://download.mono-project.com/repo/ubuntu focal main" | tee /etc/apt/sources.list.d/mono-official.list && \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y \ - cron \ - libmono-system-data4.0-cil \ - libmono-system-net-http-webrequest4.0-cil \ - libmono-system-web4.0-cil \ - mono-devel \ - mono-runtime \ - unzip && \ - echo "**** install webgrabplus ****" && \ - if [ -z "$WEBGRAB_VER" ]; then \ - WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \ - fi && \ - echo "Found Webgrabplus version ${WEBGRAB_VER}" && \ - WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \ - mkdir -p \ - /app/wg++ && \ - curl -o /tmp/wg++.tar.gz -L \ - "${WEBGRAB_URL}" && \ - tar xzf \ - /tmp/wg++.tar.gz -C \ - /app/wg++ --strip-components=1 && \ - echo "**** download siteini.pack ****" && \ - curl -o \ - /tmp/ini.zip -L \ - http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ - unzip -q /tmp/ini.zip -d /defaults/ini/ && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** add mono repository ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ + echo "deb https://download.mono-project.com/repo/ubuntu focal main" | tee /etc/apt/sources.list.d/mono-official.list && \ + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y \ + cron \ + libmono-system-data4.0-cil \ + libmono-system-net-http-webrequest4.0-cil \ + libmono-system-web4.0-cil \ + mono-devel \ + mono-runtime \ + unzip && \ + echo "**** install webgrabplus ****" && \ + if [ -z "$WEBGRAB_VER" ]; then \ + WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \ + fi && \ + echo "Found Webgrabplus version ${WEBGRAB_VER}" && \ + WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \ + mkdir -p \ + /app/wg++ && \ + curl -o /tmp/wg++.tar.gz -L \ + "${WEBGRAB_URL}" && \ + tar xzf \ + /tmp/wg++.tar.gz -C \ + /app/wg++ --strip-components=1 && \ + echo "**** download siteini.pack ****" && \ + curl -o \ + /tmp/ini.zip -L \ + http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ + unzip -q /tmp/ini.zip -d /defaults/ini/ && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # copy files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d8e8481..fd0a37f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,45 +8,45 @@ ARG DEBIAN_FRONTEND="noninteractive" ENV HOME /config RUN \ - echo "**** add mono repository ****" && \ - apt-get update && \ - apt-get install -y \ - gnupg && \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ - echo "deb https://download.mono-project.com/repo/ubuntu focal main" | tee /etc/apt/sources.list.d/mono-official.list && \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y \ - cron \ - libmono-system-data4.0-cil \ - libmono-system-net-http-webrequest4.0-cil \ - libmono-system-web4.0-cil \ - mono-devel \ - mono-runtime \ - unzip && \ - echo "**** install webgrabplus ****" && \ - if [ -z "$WEBGRAB_VER" ]; then \ - WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \ - fi && \ - echo "Found Webgrabplus version ${WEBGRAB_VER}" && \ - WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \ - mkdir -p \ - /app/wg++ && \ - curl -o /tmp/wg++.tar.gz -L \ - "${WEBGRAB_URL}" && \ - tar xzf \ - /tmp/wg++.tar.gz -C \ - /app/wg++ --strip-components=1 && \ - echo "**** download siteini.pack ****" && \ - curl -o \ - /tmp/ini.zip -L \ - http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ - unzip -q /tmp/ini.zip -d /defaults/ini/ && \ - echo "**** cleanup ****" && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** add mono repository ****" && \ + apt-get update && \ + apt-get install -y \ + gnupg && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ + echo "deb https://download.mono-project.com/repo/ubuntu focal main" | tee /etc/apt/sources.list.d/mono-official.list && \ + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y \ + cron \ + libmono-system-data4.0-cil \ + libmono-system-net-http-webrequest4.0-cil \ + libmono-system-web4.0-cil \ + mono-devel \ + mono-runtime \ + unzip && \ + echo "**** install webgrabplus ****" && \ + if [ -z "$WEBGRAB_VER" ]; then \ + WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \ + fi && \ + echo "Found Webgrabplus version ${WEBGRAB_VER}" && \ + WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux' | sed 's|.*\(http://webgrab.*tar\.gz\).*|\1|') && \ + mkdir -p \ + /app/wg++ && \ + curl -o /tmp/wg++.tar.gz -L \ + "${WEBGRAB_URL}" && \ + tar xzf \ + /tmp/wg++.tar.gz -C \ + /app/wg++ --strip-components=1 && \ + echo "**** download siteini.pack ****" && \ + curl -o \ + /tmp/ini.zip -L \ + http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ + unzip -q /tmp/ini.zip -d /defaults/ini/ && \ + echo "**** cleanup ****" && \ + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # copy files COPY root/ / diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 8cec916..cb07fa6 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,20 +2,19 @@ # copy config [[ ! -e /config/WebGrab++.config.xml ]] && \ - cp /defaults/WebGrab++.config.xml /config/ + cp /defaults/WebGrab++.config.xml /config/ [[ ! -e /config/siteini.pack ]] && \ - cp -R /defaults/ini/siteini.pack /config/ + cp -R /defaults/ini/siteini.pack /config/ # warn user about changing name for crontab file echo "******** Please use the file wg3-cron to adjust the scheduled time for running WebGrab++. wg-cron can now be deleted. ********" # add cron file for running webgrab+plus [[ ! -e /config/wg3-cron ]] && \ - cp /defaults/wg3-cron /config/wg3-cron + cp /defaults/wg3-cron /config/wg3-cron crontab -u abc /config/wg3-cron # permissions chown -R abc:abc \ - /config \ - /data - + /config \ + /data diff --git a/root/etc/services.d/cron/run b/root/etc/services.d/cron/run index 791665d..e25b352 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 1 +exec /usr/sbin/cron -f -L 1