diff --git a/Dockerfile b/Dockerfile index 27a2a46..0e3d22d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg" # package versions -ARG WEBGRAB_VER="3.1.0" +ARG WEBGRAB_VER="3.1.1" ARG WGUPDATE_VER="" # environment variables. @@ -20,7 +20,7 @@ RUN \ apt-get install -y \ gnupg && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ - echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \ + 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 \ @@ -35,7 +35,7 @@ RUN \ 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_BRANCH}_install.tar.gz" && \ + "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 && \ @@ -43,7 +43,7 @@ RUN \ WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \ curl -o \ /tmp/update.tar.gz -L \ - "http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \ + "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; \ @@ -51,7 +51,7 @@ RUN \ echo "**** download siteini.pack ****" && \ curl -o \ /tmp/ini.zip -L \ - http://webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ + http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ unzip -q /tmp/ini.zip -d /defaults/ini/ && \ echo "**** cleanup ****" && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0a8c1de..b101ff7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,7 +7,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg" # package versions -ARG WEBGRAB_VER="3.1.0" +ARG WEBGRAB_VER="3.1.1" ARG WGUPDATE_VER="" # environment variables. @@ -20,7 +20,7 @@ RUN \ apt-get install -y \ gnupg && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ - echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \ + 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 \ @@ -35,7 +35,7 @@ RUN \ 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_BRANCH}_install.tar.gz" && \ + "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 && \ @@ -43,7 +43,7 @@ RUN \ WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \ curl -o \ /tmp/update.tar.gz -L \ - "http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \ + "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; \ @@ -51,7 +51,7 @@ RUN \ echo "**** download siteini.pack ****" && \ curl -o \ /tmp/ini.zip -L \ - http://webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ + http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ unzip -q /tmp/ini.zip -d /defaults/ini/ && \ echo "**** cleanup ****" && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 84772d3..1573ba6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -7,7 +7,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg" # package versions -ARG WEBGRAB_VER="3.1.0" +ARG WEBGRAB_VER="3.1.1" ARG WGUPDATE_VER="" # environment variables. @@ -20,7 +20,7 @@ RUN \ apt-get install -y \ gnupg && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \ - echo "deb http://download.mono-project.com/repo/ubuntu bionic main" | tee /etc/apt/sources.list.d/mono-official.list && \ + 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 \ @@ -35,7 +35,7 @@ RUN \ 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_BRANCH}_install.tar.gz" && \ + "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 && \ @@ -43,7 +43,7 @@ RUN \ WGUPDATE_BRANCH=${WGUPDATE_VER%%_*} && \ curl -o \ /tmp/update.tar.gz -L \ - "http://webgrabplus.com/sites/default/files/download/SW/V${WGUPDATE_BRANCH}/WebGrabPlus_V${WGUPDATE_VER}_install.tar.gz" && \ + "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; \ @@ -51,7 +51,7 @@ RUN \ echo "**** download siteini.pack ****" && \ curl -o \ /tmp/ini.zip -L \ - http://webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ + http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \ unzip -q /tmp/ini.zip -d /defaults/ini/ && \ echo "**** cleanup ****" && \ rm -rf \ diff --git a/README.md b/README.md index 077f251..9d10359 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **22.06.20:** - Add mono webrequest library +* **12.10.20:** - Update to version 3.1.1 beta. +* **22.06.20:** - Add mono webrequest library. * **18.06.20:** - Update to v3.1.0. * **29.03.20:** - Update to v3.0.0. Changed to use wg3-cron file. * **28.05.19:** - Update to v2.1.0 and beta v2.1.9, rebase to bionic. diff --git a/readme-vars.yml b/readme-vars.yml index e610ef7..c43e374 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -62,7 +62,8 @@ app_setup_block: | # changelog changelogs: - - { date: "22.06.20:", desc: "Add mono webrequest library " } + - { date: "12.10.20:", desc: "Update to version 3.1.1 beta." } + - { date: "22.06.20:", desc: "Add mono webrequest library." } - { date: "18.06.20:", desc: "Update to v3.1.0." } - { date: "29.03.20:", desc: "Update to v3.0.0. Changed to use wg3-cron file." } - { date: "28.05.19:", desc: "Update to v2.1.0 and beta v2.1.9, rebase to bionic." }