Skip to content

Commit ad9539b

Browse files
committed
Rebase to 3.21, use https
1 parent a9b14f1 commit ad9539b

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2424
echo "> External trigger running off of master branch. To disable this trigger, add \`webgrabplus_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2525
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
26-
EXT_RELEASE=$(curl -fsL 'http://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\1|')
26+
EXT_RELEASE=$(curl -fsL 'https://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\1|')
2727
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
2828
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2929
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.21
44

55
# set version label
66
ARG BUILD_DATE
@@ -28,10 +28,10 @@ RUN \
2828
/tmp/dotnet-install.sh -c 8.0 --install-dir /app/dotnet --runtime dotnet && \
2929
echo "**** install webgrabplus ****" && \
3030
if [ -z "$WEBGRAB_VER" ]; then \
31-
WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
31+
WEBGRAB_VER=$(curl -fsL https://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
3232
fi && \
3333
echo "Found Webgrabplus version ${WEBGRAB_VER}" && \
34-
WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(http://webgrab.*.gz\).*|\1|') && \
34+
WEBGRAB_URL=$(curl -fsL https://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(https://webgrab.*.gz\).*|\1|') && \
3535
mkdir -p \
3636
/app/wg++ && \
3737
curl -o /tmp/wg++.tar.gz -L \
@@ -42,7 +42,7 @@ RUN \
4242
echo "**** download siteini.pack ****" && \
4343
curl -o \
4444
/tmp/ini.zip -L \
45-
http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \
45+
https://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \
4646
unzip -q /tmp/ini.zip -d /defaults/ini/ && \
4747
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4848
echo "**** cleanup ****" && \

Dockerfile.aarch64

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
44

55
# set version label
66
ARG BUILD_DATE
@@ -29,10 +29,10 @@ RUN \
2929
/tmp/dotnet-install.sh -c 8.0 --install-dir /app/dotnet --runtime dotnet && \
3030
echo "**** install webgrabplus ****" && \
3131
if [ -z "$WEBGRAB_VER" ]; then \
32-
WEBGRAB_VER=$(curl -fsL http://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
32+
WEBGRAB_VER=$(curl -fsL https://webgrabplus.com/download/sw | grep -m1 /download/sw/v | sed 's|.*/download/sw/v\(.*\)">V.*|\1|'); \
3333
fi && \
3434
echo "Found Webgrabplus version ${WEBGRAB_VER}" && \
35-
WEBGRAB_URL=$(curl -fsL http://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(http://webgrab.*\.gz\).*|\1|') && \
35+
WEBGRAB_URL=$(curl -fsL https://webgrabplus.com/download/sw/v${WEBGRAB_VER} | grep '>Linux</a>' | sed 's|.*\(https://webgrab.*\.gz\).*|\1|') && \
3636
mkdir -p \
3737
/app/wg++ && \
3838
curl -o /tmp/wg++.tar.gz -L \
@@ -43,7 +43,7 @@ RUN \
4343
echo "**** download siteini.pack ****" && \
4444
curl -o \
4545
/tmp/ini.zip -L \
46-
http://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \
46+
https://www.webgrabplus.com/sites/default/files/download/ini/SiteIniPack_current.zip && \
4747
unzip -q /tmp/ini.zip -d /defaults/ini/ && \
4848
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4949
echo "**** cleanup ****" && \

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pipeline {
131131
steps{
132132
script{
133133
env.EXT_RELEASE = sh(
134-
script: ''' curl -fsL 'http://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\\1|' ''',
134+
script: ''' curl -fsL 'https://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\\1|' ''',
135135
returnStdout: true).trim()
136136
env.RELEASE_LINK = 'custom_command'
137137
}
@@ -573,7 +573,7 @@ pipeline {
573573
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
574574
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
575575
--label \"org.opencontainers.image.title=Webgrabplus\" \
576-
--label \"org.opencontainers.image.description=[Webgrabplus](http://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.\" \
576+
--label \"org.opencontainers.image.description=[Webgrabplus](https://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.\" \
577577
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
578578
--provenance=true --sbom=true --builder=container --load \
579579
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
@@ -639,7 +639,7 @@ pipeline {
639639
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
640640
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
641641
--label \"org.opencontainers.image.title=Webgrabplus\" \
642-
--label \"org.opencontainers.image.description=[Webgrabplus](http://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.\" \
642+
--label \"org.opencontainers.image.description=[Webgrabplus](https://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.\" \
643643
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
644644
--provenance=true --sbom=true --builder=container --load \
645645
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
@@ -698,7 +698,7 @@ pipeline {
698698
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
699699
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
700700
--label \"org.opencontainers.image.title=Webgrabplus\" \
701-
--label \"org.opencontainers.image.description=[Webgrabplus](http://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.\" \
701+
--label \"org.opencontainers.image.description=[Webgrabplus](https://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.\" \
702702
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
703703
--provenance=true --sbom=true --builder=container --load \
704704
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ Find us at:
3939
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-webgrabplus%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webgrabplus/job/master/)
4040
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fwebgrabplus%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/webgrabplus/latest/index.html)
4141

42-
[Webgrabplus](http://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.
42+
[Webgrabplus](https://www.webgrabplus.com) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels.
4343

44-
[![webgrabplus](http://www.webgrabplus.com/sites/default/themes/WgTheme/images/slideshows/EPG_fading.jpg)](http://www.webgrabplus.com)
44+
[![webgrabplus](https://www.webgrabplus.com/sites/default/themes/WgTheme/images/slideshows/EPG_fading.jpg)](https://www.webgrabplus.com)
4545

4646
## Supported Architectures
4747

@@ -59,7 +59,7 @@ The architectures supported by this image are:
5959

6060
## Application Setup
6161

62-
To configure WebGrab+Plus follow the [documentation](http://www.webgrabplus.com/documentation/configuration/)
62+
To configure WebGrab+Plus follow the [documentation](https://www.webgrabplus.com/documentation/configuration/)
6363

6464
**Please note that depending on your host this container may not work with the `no-new-privileges=true` security-opt.**
6565

@@ -291,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
291291

292292
## Versions
293293

294+
* **25.06.24:** - Rebase to Alpine 3.21.
294295
* **25.06.24:** - Rebase to Alpine 3.20.
295296
* **23.04.24:** - Bump dotnet framework to 8.x.
296297
* **23.12.23:** - Rebase to Alpine 3.19.

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-webgrabplus
55
external_type: na
6-
custom_version_command: "curl -fsL 'http://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\\\\1|'"
6+
custom_version_command: "curl -fsL 'https://webgrabplus.com/download/sw' | grep -m1 '/download/sw/v' | sed -r 's|.*/download/sw/v(.*).>V.*|\\\\1|'"
77
release_type: stable
88
release_tag: latest
99
ls_branch: master

readme-vars.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# project information
44
project_name: webgrabplus
5-
project_url: "http://www.webgrabplus.com"
6-
project_logo: "http://www.webgrabplus.com/sites/default/themes/WgTheme/images/slideshows/EPG_fading.jpg"
5+
project_url: "https://www.webgrabplus.com"
6+
project_logo: "https://www.webgrabplus.com/sites/default/themes/WgTheme/images/slideshows/EPG_fading.jpg"
77
project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a multi-site incremental xmltv epg grabber. It collects tv-program guide data from selected tvguide sites for your favourite channels."
88
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
99
project_categories: "Media Tools"
@@ -24,10 +24,12 @@ param_usage_include_vols: true
2424
param_volumes:
2525
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"}
2626
- {vol_path: "/data", vol_host_path: "/path/to/data", desc: "Where webgrabplus should store it's data files."}
27+
readonly_supported: false
28+
nonroot_supported: false
2729
# application setup block
2830
app_setup_block_enabled: true
2931
app_setup_block: |
30-
To configure WebGrab+Plus follow the [documentation](http://www.webgrabplus.com/documentation/configuration/)
32+
To configure WebGrab+Plus follow the [documentation](https://www.webgrabplus.com/documentation/configuration/)
3133
3234
**Please note that depending on your host this container may not work with the `no-new-privileges=true` security-opt.**
3335
@@ -82,6 +84,7 @@ init_diagram: |
8284
"webgrabplus:latest" <- Base Images
8385
# changelog
8486
changelogs:
87+
- {date: "25.06.24:", desc: "Rebase to Alpine 3.21."}
8588
- {date: "25.06.24:", desc: "Rebase to Alpine 3.20."}
8689
- {date: "23.04.24:", desc: "Bump dotnet framework to 8.x."}
8790
- {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}

0 commit comments

Comments
 (0)