From 3cced1d3349fdf05d90a686dcba615b720f5099f Mon Sep 17 00:00:00 2001 From: jaannnis Date: Sun, 24 Sep 2023 15:15:54 +0200 Subject: [PATCH 01/13] Update Dockerfile install wireguard copy wireguard config added wireguarg config Update Dockerfile Update Dockerfile a cleanup --- .gitignore | 2 ++ Dockerfile | 9 +++++++-- .../init-wireguard/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/init-wireguard/run | 10 ++++++++++ root/etc/s6-overlay/s6-rc.d/init-wireguard/type | 1 + root/etc/s6-overlay/s6-rc.d/init-wireguard/up | 0 root/etc/s6-overlay/s6-rc.d/svc-plex/run | 2 ++ .../s6-overlay/s6-rc.d/user/contents.d/init-wireguard | 0 8 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-wireguard/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/init-wireguard/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-wireguard/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-wireguard/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-wireguard diff --git a/.gitignore b/.gitignore index 6e8ad97..b733b8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# Wireguard configs, you never know +wg*.conf # Windows image file caches Thumbs.db ehthumbs.db diff --git a/Dockerfile b/Dockerfile index 36ef5db..409d635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,12 +26,14 @@ ENV DEBIAN_FRONTEND="noninteractive" \ PLEX_MEDIA_SERVER_INFO_DEVICE="Docker Container (LinuxServer.io)" RUN \ - echo "**** install runtime packages ****" && \ + echo "**** install runtime packages & wireguard ****" && \ apt-get update && \ apt-get install -y \ jq \ udev \ - wget && \ + wget \ + iproute2 \ + wireguard-tools &&\ echo "**** install plex ****" && \ if [ -z ${PLEX_RELEASE+x} ]; then \ PLEX_RELEASE=$(curl -sX GET 'https://plex.tv/api/downloads/5.json' \ @@ -54,6 +56,9 @@ RUN \ # add local files COPY root/ / +# add wireguard config +COPY ./wg0.conf /etc/wireguard/wg0.conf + # add unrar COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/init-wireguard/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run new file mode 100755 index 0000000..e5989a5 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash +# Bring up WireGuard if not already up +if ! ip link show dev wg0 > /dev/null 2>&1; then + wg-quick up wg0 +else +sleep 60 +fi + +# Exit after running +exit 0 diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/type b/root/etc/s6-overlay/s6-rc.d/init-wireguard/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/up b/root/etc/s6-overlay/s6-rc.d/init-wireguard/up new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/run b/root/etc/s6-overlay/s6-rc.d/svc-plex/run index 8486676..6a5aefa 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-plex/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-plex/run @@ -1,5 +1,7 @@ #!/usr/bin/with-contenv bash +# Wait for WireGuard to be up + echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)" export PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m) export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r) diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-wireguard b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-wireguard new file mode 100644 index 0000000..e69de29 From fa08911915af91282592fff1f8049316d496f677 Mon Sep 17 00:00:00 2001 From: jaannnis Date: Sat, 30 Sep 2023 11:16:44 +0200 Subject: [PATCH 02/13] Update README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index e5d3a36..ae07615 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,19 @@ +<<<<<<< HEAD +======= +due to the recent purge of Hosters by plex, this fork adds wireguard functionallity to the plex container as a quick workaround. all traffic gets tunneled. + +wireguard onfig file has to be mounted in /etc/wireguard/wg0.conf. e.g.: +``` + volumes: + - ./wg0.conf:/etc/wireguard/wg0.conf +``` + + + + +>>>>>>> 72bdfaa (Update README.md) [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") From 603a79335fd9c6a747b17669a1a5e13275befd30 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 30 Sep 2023 09:24:28 +0000 Subject: [PATCH 03/13] removed wg0 at build --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 409d635..7488ceb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,8 +56,6 @@ RUN \ # add local files COPY root/ / -# add wireguard config -COPY ./wg0.conf /etc/wireguard/wg0.conf # add unrar COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar From 56d67a38c471d7e75c838b91d57a9be67ec139cc Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 27 Dec 2024 13:00:23 +0000 Subject: [PATCH 04/13] made wg a dependency for plex service --- root/etc/s6-overlay/s6-rc.d/init-wireguard/run | 12 ++++++++---- .../s6-rc.d/svc-plex/dependencies.d/init-wireguard | 0 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-wireguard diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run index e5989a5..85ad6c3 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run @@ -1,10 +1,14 @@ #!/usr/bin/with-contenv bash + # Bring up WireGuard if not already up if ! ip link show dev wg0 > /dev/null 2>&1; then wg-quick up wg0 -else -sleep 60 fi -# Exit after running -exit 0 +# Monitor wireguard status +while true; do + if ! ip link show dev wg0 | grep -q "UP"; then + wg-quick up wg0 + fi + sleep 60 +done diff --git a/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-wireguard b/root/etc/s6-overlay/s6-rc.d/svc-plex/dependencies.d/init-wireguard new file mode 100644 index 0000000..e69de29 From be4e12409d7e0fcb0705677335c9b2a24c421227 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 6 Apr 2026 10:14:36 +0000 Subject: [PATCH 05/13] Bot Updating Templated Files --- Jenkinsfile | 172 ++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 87 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b4fb77c..f0e1f0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -77,6 +77,7 @@ pipeline { ''' script{ env.EXIT_STATUS = '' + env.CI_TEST_ATTEMPTED = '' env.LS_RELEASE = sh( script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() @@ -873,6 +874,7 @@ pipeline { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' + env.CI_TEST_ATTEMPTED = 'true' } sh '''#! /bin/bash set -e @@ -1075,98 +1077,13 @@ EOF ) ''' } } - // If this is a Pull request send the CI link as a comment on it - stage('Pull Request Comment') { - when { - not {environment name: 'CHANGE_ID', value: ''} - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - # Function to retrieve JSON data from URL - get_json() { - local url="$1" - local response=$(curl -s "$url") - if [ $? -ne 0 ]; then - echo "Failed to retrieve JSON data from $url" - return 1 - fi - local json=$(echo "$response" | jq .) - if [ $? -ne 0 ]; then - echo "Failed to parse JSON data from $url" - return 1 - fi - echo "$json" - } - - build_table() { - local data="$1" - - # Get the keys in the JSON data - local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') - - # Check if keys are empty - if [ -z "$keys" ]; then - echo "JSON report data does not contain any keys or the report does not exist." - return 1 - fi - - # Build table header - local header="| Tag | Passed |\\n| --- | --- |\\n" - - # Loop through the JSON data to build the table rows - local rows="" - for build in $keys; do - local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") - if [ "$status" = "true" ]; then - status="✅" - else - status="❌" - fi - local row="| "$build" | "$status" |\\n" - rows="${rows}${row}" - done - - local table="${header}${rows}" - local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') - echo "$escaped_table" - } - - if [[ "${CI}" = "true" ]]; then - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" - - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" - else - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" - fi - ''' - - } - } } /* ###################### - Send status to Discord + Comment on PR and Send status to Discord ###################### */ post { always { - sh '''#!/bin/bash - rm -rf /config/.ssh/id_sign - rm -rf /config/.ssh/id_sign.pub - git config --global --unset gpg.format - git config --global --unset user.signingkey - git config --global --unset commit.gpgsign - ''' - script{ + script { env.JOB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', returnStdout: true).trim() @@ -1209,6 +1126,87 @@ EOF "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } + script { + if (env.GITHUBIMAGE =~ /lspipepr/){ + if (env.CI_TEST_ATTEMPTED == "true"){ + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' + } + } + } + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' } cleanup { sh '''#! /bin/bash From e0048bb650bfc34561e28b0fce398708aff479a7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Apr 2026 15:46:39 +0000 Subject: [PATCH 06/13] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d6deaa3..d3c49a0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,10 +108,10 @@ libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.4 deb libssl3t64 3.0.13-0ubuntu3.7 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb -libsystemd0 255.4-1ubuntu8.14 deb +libsystemd0 255.4-1ubuntu8.15 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.14 deb +libudev1 255.4-1ubuntu8.15 deb libunistring5 1.1-2build1.1 deb libuuid1 2.39.3-9ubuntu6.5 deb libxxhash0 0.8.2-2build1 deb @@ -128,20 +128,20 @@ openssl 3.0.13-0ubuntu3.7 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.43.0.10492-121068a07 deb +plexmediaserver 1.43.1.10576-06378bdcd deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb sed 4.9-2build1 deb sensible-utils 0.0.22 deb -systemd-dev 255.4-1ubuntu8.14 deb +systemd-dev 255.4-1ubuntu8.15 deb systemd-hwe-hwdb 255.1.7 deb -systemd-standalone-sysusers 255.4-1ubuntu8.14 deb +systemd-standalone-sysusers 255.4-1ubuntu8.15 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tzdata 2025b-0ubuntu0.24.04.1 deb +tzdata 2026a-0ubuntu0.24.04.1 deb ubuntu-keyring 2023.11.28.1 deb -udev 255.4-1ubuntu8.14 deb +udev 255.4-1ubuntu8.15 deb unminimize 0.2.1 deb util-linux 2.39.3-9ubuntu6.5 deb wget 1.21.4-1ubuntu4.1 deb From 1a7cf74b6ec7ab0ce9efedd7b53963c40153e512 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Apr 2026 13:52:50 +0000 Subject: [PATCH 07/13] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d3c49a0..47beda4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,7 +128,7 @@ openssl 3.0.13-0ubuntu3.7 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb -plexmediaserver 1.43.1.10576-06378bdcd deb +plexmediaserver 1.43.1.10611-1e34174b1 deb procps 2:4.0.4-4ubuntu3.2 deb publicsuffix 20231001.0357-0.1 deb readline-common 8.2-4build1 deb From 7378fb237dcfbd304b14f64ef0533590cff62dd5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 20 Apr 2026 10:55:12 +0000 Subject: [PATCH 08/13] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 47beda4..64660a3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libsmartcols1 2.39.3-9ubuntu6.5 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb libssh-4 0.10.6-2ubuntu0.4 deb -libssl3t64 3.0.13-0ubuntu3.7 deb +libssl3t64 3.0.13-0ubuntu3.9 deb libstdc++6 14.2.0-4ubuntu2~24.04.1 deb libsystemd0 255.4-1ubuntu8.15 deb libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb @@ -124,7 +124,7 @@ mount 2.39.3-9ubuntu6.5 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.7 deb +openssl 3.0.13-0ubuntu3.9 deb passwd 1:4.13+dfsg1-4ubuntu3.2 deb perl-base 5.38.2-3.2ubuntu0.2 deb pinentry-curses 1.2.1-3ubuntu5 deb From 68fa685a3cd2e3a6d3972e6adc35a72b97988c50 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 27 Apr 2026 11:10:30 +0000 Subject: [PATCH 09/13] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 64660a3..5e522eb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -50,7 +50,7 @@ libbz2-1.0 1.0.8-5.1build0.1 deb libc-bin 2.39-0ubuntu8.7 deb libc6 2.39-0ubuntu8.7 deb libcap-ng0 0.8.4-2build2 deb -libcap2 1:2.66-5ubuntu2.2 deb +libcap2 1:2.66-5ubuntu2.4 deb libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb libcrypt1 1:4.4.36-4build1 deb libcurl4t64 8.5.0-2ubuntu10.8 deb From 0a43190ac9160d7f4e9b92e86a75b9e43dd4cc00 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 4 May 2026 11:10:31 +0000 Subject: [PATCH 10/13] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5e522eb..d36b5b4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -34,7 +34,7 @@ grep 3.11-4build1 deb gzip 1.12-1ubuntu3.1 deb hostname 3.23+nmu2ubuntu2 deb init-system-helpers 1.66ubuntu1 deb -jq 1.7.1-3ubuntu0.24.04.1 deb +jq 1.7.1-3ubuntu0.24.04.2 deb keyboxd 2.4.4-2ubuntu17.4 deb krb5-locales 1.20.1-6ubuntu2.6 deb libacl1 2.3.2-1build1.1 deb @@ -66,10 +66,10 @@ libgpg-error0 1.47-3build2.1 deb libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb libhogweed6t64 3.9.1-2.2build1.1 deb libidn2-0 2.3.7-2build1.1 deb -libjq1 1.7.1-3ubuntu0.24.04.1 deb +libjq1 1.7.1-3ubuntu0.24.04.2 deb libk5crypto3 1.20.1-6ubuntu2.6 deb libkeyutils1 1.6.3-3build1 deb -libkmod2 31+20240202-2ubuntu7.1 deb +libkmod2 31+20240202-2ubuntu7.2 deb libkrb5-3 1.20.1-6ubuntu2.6 deb libkrb5support0 1.20.1-6ubuntu2.6 deb libksba8 1.6.6-1build1 deb From 3faea15cf31915e16f38111665a862fbb52c0efc Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 9 May 2026 10:03:33 +0200 Subject: [PATCH 11/13] ci: add forgejo actions build workflow --- .forgejo/workflows/build.yml | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .forgejo/workflows/build.yml diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..71e6389 --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,46 @@ +name: Build and push image + +on: + push: + branches: [master] + schedule: + - cron: '0 4 * * *' # daily, picks up LSIO base image updates + workflow_dispatch: + +jobs: + build: + runs-on: docker + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.PUSH_TOKEN }} + + - name: Merge upstream + run: | + git config user.name "forgejo-runner" + git config user.email "runner@forge.jannis.wtf" + git remote add upstream https://github.com/linuxserver/docker-plex + git fetch upstream + git merge upstream/master --no-edit + git push origin master + + - name: Set up Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Forgejo registry + uses: docker/login-action@v3 + with: + registry: git.example.com + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: | + forge.jannis.wtf/fej/plex-wireguard:latest + forge.jannis.wtf/fej/plex-wireguard:${{ github.sha }} From 2d16c92cb3d95145bced7e44256cb245e2317c7f Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 9 May 2026 10:30:50 +0200 Subject: [PATCH 12/13] fix pipeline --- .forgejo/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 71e6389..1a1fb83 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -14,6 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: + ref: master fetch-depth: 0 token: ${{ secrets.PUSH_TOKEN }} @@ -21,6 +22,8 @@ jobs: run: | git config user.name "forgejo-runner" git config user.email "runner@forge.jannis.wtf" + git fetch origin master + git reset --hard origin/master git remote add upstream https://github.com/linuxserver/docker-plex git fetch upstream git merge upstream/master --no-edit From 492da39dea5c38bdfc7b1398b39e2418e193e0f4 Mon Sep 17 00:00:00 2001 From: fej Date: Sat, 9 May 2026 10:34:17 +0200 Subject: [PATCH 13/13] Update .forgejo/workflows/build.yml --- .forgejo/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 1a1fb83..7152c11 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -35,7 +35,7 @@ jobs: - name: Login to Forgejo registry uses: docker/login-action@v3 with: - registry: git.example.com + registry: forge.jannis.wtf username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_TOKEN }} @@ -46,4 +46,4 @@ jobs: push: true tags: | forge.jannis.wtf/fej/plex-wireguard:latest - forge.jannis.wtf/fej/plex-wireguard:${{ github.sha }} + forge.jannis.wtf/fej/plex-wireguard:${{ github.sha }} \ No newline at end of file