Update .forgejo/workflows/build.yml

install wireguard
copy wireguard config

added wireguarg config

Update Dockerfile

Update Dockerfile

a

cleanup

.forgejo/workflows/build.yml

@@ -0,0 +1,49 @@
+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:
+          ref: master
+          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 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
+          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: forge.jannis.wtf
+          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 }}

.gitignore

@@ -1,3 +1,5 @@
+# Wireguard configs, you never know
+wg*.conf
 # Windows image file caches
 Thumbs.db
 ehthumbs.db

Dockerfile

@@ -28,11 +28,13 @@ ENV DEBIAN_FRONTEND="noninteractive" \
   ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb -type c"
 
 RUN \
-  echo "**** install runtime packages ****" && \
+  echo "**** install runtime packages & wireguard ****" && \
   apt-get update && \
   apt-get install -y \
     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' \
@@ -56,6 +58,7 @@ RUN \
 # add local files
 COPY root/ /
 
+
 # add unrar
 COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
 

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,13 +1077,58 @@ 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 {
+  /* ######################
+     Comment on PR and Send status to Discord
+     ###################### */
+  post {
+    always {
+      script {
+        env.JOB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
+        if (env.EXIT_STATUS == "ABORTED"){
+          sh 'echo "build aborted"'
+        }else{
+          if (currentBuild.currentResult == "SUCCESS"){
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=1681177
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }else{
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=16711680
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
+                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
+                 "timestamp": "'${JOB_DATE}'",\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "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() {
@@ -1150,15 +1197,9 @@ EOF
                       -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
-     ###################### */
-  post {
-    always {
       sh '''#!/bin/bash
             rm -rf /config/.ssh/id_sign
             rm -rf /config/.ssh/id_sign.pub
@@ -1166,49 +1207,6 @@ EOF
             git config --global --unset user.signingkey
             git config --global --unset commit.gpgsign
         '''
-      script{
-        env.JOB_DATE = sh(
-            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
-            returnStdout: true).trim()
-        if (env.EXIT_STATUS == "ABORTED"){
-          sh 'echo "build aborted"'
-        }else{
-          if (currentBuild.currentResult == "SUCCESS"){
-            if (env.GITHUBIMAGE =~ /lspipepr/){
-              env.JOB_WEBHOOK_STATUS='Success'
-              env.JOB_WEBHOOK_COLOUR=3957028
-              env.JOB_WEBHOOK_FOOTER='PR Build'
-            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-              env.JOB_WEBHOOK_STATUS='Success'
-              env.JOB_WEBHOOK_COLOUR=3957028
-              env.JOB_WEBHOOK_FOOTER='Dev Build'
-            }else{
-              env.JOB_WEBHOOK_STATUS='Success'
-              env.JOB_WEBHOOK_COLOUR=1681177
-              env.JOB_WEBHOOK_FOOTER='Live Build'
-            }
-          }else{
-            if (env.GITHUBIMAGE =~ /lspipepr/){
-              env.JOB_WEBHOOK_STATUS='Failure'
-              env.JOB_WEBHOOK_COLOUR=12669523
-              env.JOB_WEBHOOK_FOOTER='PR Build'
-            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-              env.JOB_WEBHOOK_STATUS='Failure'
-              env.JOB_WEBHOOK_COLOUR=12669523
-              env.JOB_WEBHOOK_FOOTER='Dev Build'
-            }else{
-              env.JOB_WEBHOOK_STATUS='Failure'
-              env.JOB_WEBHOOK_COLOUR=16711680
-              env.JOB_WEBHOOK_FOOTER='Live Build'
-            }
-          }
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
-                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
-                 "timestamp": "'${JOB_DATE}'",\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
-        }
-      }
     }
     cleanup {
       sh '''#! /bin/bash

README.md

@@ -1,5 +1,19 @@
+<<<<<<< HEAD
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
 <!-- Please read https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md -->
+=======
+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
+```
+
+<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- Please read the https://github.com/linuxserver/docker-plex/blob/master/.github/CONTRIBUTING.md -->
+
+>>>>>>> 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!")

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     
@@ -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     
@@ -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     
@@ -106,12 +106,12 @@ 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.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     
@@ -124,24 +124,24 @@ 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     
-plexmediaserver              1.43.0.10492-121068a07             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     
 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     

root/etc/s6-overlay/s6-rc.d/init-wireguard/run

@@ -0,0 +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
+fi
+
+# Monitor wireguard status
+while true; do
+    if ! ip link show dev wg0 | grep -q "UP"; then
+        wg-quick up wg0
+    fi
+    sleep 60
+done

root/etc/s6-overlay/s6-rc.d/init-wireguard/type

@@ -0,0 +1 @@
+longrun

root/etc/s6-overlay/s6-rc.d/svc-plex/run

@@ -1,6 +1,8 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
+# Wait for WireGuard to be up
+
 echo "Starting Plex Media Server. . . (you can ignore the libusb_init error)"
 PLEX_MEDIA_SERVER_INFO_MODEL=$(uname -m)
 export PLEX_MEDIA_SERVER_INFO_MODEL