Merge pull request #48 from linuxserver/version

rebase to focal, enable auto build (beta+stable)
2026-02-19 19:52:00 +08:00 · 2022-01-06 19:07:40 -05:00 · 2022-01-06 19:07:40 -05:00 · bfce638852
commit bfce638852
parent 62e8e631cf 60f6cec4de
10 changed files with 136 additions and 159 deletions
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -18,7 +18,7 @@ jobs:
          fi
          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_WEBGRABPLUS_MASTER\". ****"
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(echo V3.2.2)
+          EXT_RELEASE=$(curl -fsL 'http://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\1|')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
            FAILURE_REASON="Can't retrieve external version for webgrabplus branch master"
--- a/88
+++ b/88
@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal

 # set version label
 ARG BUILD_DATE
@ -7,58 +7,52 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"

 # package versions
-ARG WEBGRAB_VER="3.2.2"
-ARG WGUPDATE_VER=""
+ARG WEBGRAB_VER

 # environment variables.
 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 bionic 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 ****" && \
- WEBGRAB_BRANCH=${WEBGRAB_VER%.*} && \
- mkdir -p \
-	/app/wg++ && \
- curl -o /tmp/wg++.tar.gz -L \
-	"http://www.webgrabplus.com/sites/default/files/download/SW/V${WEBGRAB_VER}/WebGrabPlus_V${WEBGRAB_VER}_beta_install.tar.gz" && \
- tar xzf \
- /tmp/wg++.tar.gz -C \
-	/app/wg++ --strip-components=1 && \
- if [ ! -z "$WGUPDATE_ver" ]; then \
- 	WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
- 	curl -o \
- 	/tmp/update.tar.gz -L \
-		"http://www.webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
- 	tar xf \
- 	/tmp/update.tar.gz -C \
-		/app/wg++/bin/ --strip-components=2; \
- fi && \
- 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</a>' | 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/ /
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal

 # set version label
 ARG BUILD_DATE
@ -7,58 +7,52 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="saarg"

 # package versions
-ARG WEBGRAB_VER="3.2.2"
-ARG WGUPDATE_VER=""
+ARG WEBGRAB_VER

 # environment variables.
 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 bionic 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 ****" && \
- WEBGRAB_BRANCH=${WEBGRAB_VER%.*} && \
- mkdir -p \
-	/app/wg++ && \
- curl -o /tmp/wg++.tar.gz -L \
-	"http://www.webgrabplus.com/sites/default/files/download/SW/V${WEBGRAB_VER}/WebGrabPlus_V${WEBGRAB_VER}_beta_install.tar.gz" && \
- tar xzf \
- /tmp/wg++.tar.gz -C \
-	/app/wg++ --strip-components=1 && \
- if [ ! -z "$WGUPDATE_ver" ]; then \
- WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
- curl -o \
- /tmp/update.tar.gz -L \
-	"http://www.webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
- tar xf \
- /tmp/update.tar.gz -C \
-	/app/wg++/bin/ --strip-components=2; \
- fi && \
- 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</a>' | 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/ /
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -1,64 +1,52 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="saarg"
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal

 # package versions
-ARG WEBGRAB_VER="3.2.2"
-ARG WGUPDATE_VER=""
+ARG WEBGRAB_VER

 # environment variables.
 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 bionic 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 ****" && \
- WEBGRAB_BRANCH=${WEBGRAB_VER%.*} && \
- mkdir -p \
-	/app/wg++ && \
- curl -o /tmp/wg++.tar.gz -L \
-	"http://webgrabplus.com/sites/default/files/download/SW/V${WEBGRAB_VER}/WebGrabPlus_V${WEBGRAB_VER}_beta_install.tar.gz" && \
- tar xzf \
- /tmp/wg++.tar.gz -C \
-	/app/wg++ --strip-components=1 && \
- if [ ! -z "$WGUPDATE_ver" ]; then \
- WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \
- curl -o \
- /tmp/update.tar.gz -L \
-	"http://www.webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \
- tar xf \
- /tmp/update.tar.gz -C \
-	/app/wg++/bin/ --strip-components=2; \
- fi && \
- 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</a>' | 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/ /
--- a/4
+++ b/4
@ -17,7 +17,7 @@ pipeline {
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
    SCARF_TOKEN=credentials('scarf_api_key')
-    BUILD_VERSION_ARG = 'WEBGRAB_VERSION'
+    BUILD_VERSION_ARG = 'WEBGRAB_VER'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-webgrabplus'
    CONTAINER_NAME = 'webgrabplus'
@ -104,7 +104,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' echo V3.2.2 ''',
+            script: ''' curl -fsL 'http://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\\1|' ''',
            returnStdout: true).trim()
            env.RELEASE_LINK = 'custom_command'
        }
--- a/README.md
+++ b/README.md
@ -246,6 +246,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **06.01.22:** - Rebase to Ubuntu focal. Enable auto builds on version updates (beta and stable).
 * **17.12.21:** - Update to version 3.2.2 beta.
 * **05.08.21:** - Update to version 3.2.1 beta.
 * **05.06.21:** - Added mono-devel dependency.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,12 +3,12 @@
 # jenkins variables
 project_name: docker-webgrabplus
 external_type: na
-custom_version_command: 'echo V3.2.2'
+custom_version_command: "curl -fsL 'http://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\\\\1|'"
 release_type: stable
 release_tag: latest
 ls_branch: master
 repo_vars:
-  - BUILD_VERSION_ARG = 'WEBGRAB_VERSION'
+  - BUILD_VERSION_ARG = 'WEBGRAB_VER'
  - LS_USER = 'linuxserver'
  - LS_REPO = 'docker-webgrabplus'
  - CONTAINER_NAME = 'webgrabplus'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -62,6 +62,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "06.01.22:", desc: "Rebase to Ubuntu focal. Enable auto builds on version updates (beta and stable)." } 
  - { date: "17.12.21:", desc: "Update to version 3.2.2 beta." } 
  - { date: "05.08.21:", desc: "Update to version 3.2.1 beta." } 
  - { date: "05.06.21:", desc: "Added mono-devel dependency." } 
--- 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
--- 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