Merge pull request #326 from pabloromeo/experimental

Migration to s6-overlay v3 and nginx listen ports for ipv4 and ipv6
pabloromeo · Jul 25, 2024 · c4c6698 · c4c6698
2 parents 5667124 + 90c3027
commit c4c6698
Show file tree

Hide file tree

Showing 60 changed files with 147 additions and 12 deletions.
diff --git a/...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies b/...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies
diff --git a/...r-mod/root/etc/cont-init.d/93-npm-install → ...ocker-mod/_old_cont-init.d/93-npm-install b/...r-mod/root/etc/cont-init.d/93-npm-install → ...ocker-mod/_old_cont-init.d/93-npm-install
diff --git a/...tc/cont-init.d/94-install-transcoder-shim → ...ld_cont-init.d/94-install-transcoder-shim b/...tc/cont-init.d/94-install-transcoder-shim → ...ld_cont-init.d/94-install-transcoder-shim
diff --git a/...r-mod/root/etc/cont-init.d/95-setup-nginx → ...ocker-mod/_old_cont-init.d/95-setup-nginx b/...r-mod/root/etc/cont-init.d/95-setup-nginx → ...ocker-mod/_old_cont-init.d/95-setup-nginx
diff --git a/pms/docker-mod/root/etc/services.d/nginx/run → pms/docker-mod/_old_services.d/nginx/run b/pms/docker-mod/root/etc/services.d/nginx/run → pms/docker-mod/_old_services.d/nginx/run
diff --git a/pms/docker-mod/root/etc/nginx/sites-available/forward-proxy.conf b/pms/docker-mod/root/etc/nginx/sites-available/forward-proxy.conf
@@ -1,5 +1,6 @@
 server {
-    listen [::]:_LOCAL_RELAY_PORT ipv6only=off;
+    listen _LOCAL_RELAY_PORT;
+    listen [::]:_LOCAL_RELAY_PORT;
     location /video/:/transcode/session/ { 
         proxy_pass http://127.0.0.1:_PMS_PORT;
         proxy_request_buffering off;

diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/run b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
@@ -0,0 +1,16 @@
+#!/usr/bin/with-contenv bash
+
+if which node > /dev/null
+then
+    echo "**** node is installed, skipping... ****"
+else
+    echo "**** install runtime packages ****"
+    echo "**** apt-get update ****"
+    apt-get update
+    echo "**** install libatomic1, file, nginx ****"
+    apt-get install -y libatomic1 file nginx
+    echo "**** install 'n' ****"
+    curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
+    echo "**** install nodejs ****"
+    bash n lts
+fi
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/type b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/type
@@ -0,0 +1 @@
+oneshot
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/up b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
diff --git a/...ocker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/dependencies.d/1-install-dependencies b/...ocker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/dependencies.d/1-install-dependencies
diff --git a/...r-mod/root/etc/cont-init.d/93-npm-install → .../etc/s6-overlay/s6-rc.d/2-npm-install/run b/...r-mod/root/etc/cont-init.d/93-npm-install → .../etc/s6-overlay/s6-rc.d/2-npm-install/run
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/type b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/type
@@ -0,0 +1 @@
+oneshot
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/up b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/2-npm-install/run
diff --git a/...ot/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/dependencies.d/1-install-dependencies b/...ot/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/dependencies.d/1-install-dependencies
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/run b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/run
@@ -0,0 +1,17 @@
+#!/usr/bin/with-contenv bash
+
+if file /usr/lib/plexmediaserver/'Plex Transcoder' | grep -iq ASCII ; then
+    echo "**** Transcoder is already clusterplex, only update ****"
+else
+    echo "**** Transcoder is still original, rename ****"
+    mv /usr/lib/plexmediaserver/'Plex Transcoder' /usr/lib/plexmediaserver/originalTranscoder
+fi
+
+echo "**** Move shim to destination ****"
+cp /app/transcoder-shim.sh /usr/lib/plexmediaserver/'Plex Transcoder'
+
+echo "**** Make the shim executable ****"
+chmod +x /usr/lib/plexmediaserver/'Plex Transcoder'
+
+echo "**** Make sentinel.sh executable ****"
+chmod +x /app/sentinel.sh
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/type b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/type
@@ -0,0 +1 @@
+oneshot
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/up b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/run
diff --git a/...ocker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/dependencies.d/1-install-dependencies b/...ocker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/dependencies.d/1-install-dependencies
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/run b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/run
@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** unlink nginx default ****"
+unlink /etc/nginx/sites-enabled/default
+echo "**** link nginx forward-proxy ****"
+ln -s /etc/nginx/sites-available/forward-proxy.conf /etc/nginx/sites-enabled/forward-proxy.conf
+
+echo "**** configuring nginx (for Local Relay) forwarding ports ****"
+echo "PMS_PORT => '${PMS_PORT}'"
+echo "LOCAL_RELAY_PORT => '${LOCAL_RELAY_PORT}'"
+
+sed -i 's/_PMS_PORT/'"${PMS_PORT:-32400}"'/g' /etc/nginx/sites-available/forward-proxy.conf
+sed -i 's/_LOCAL_RELAY_PORT/'"${LOCAL_RELAY_PORT:-32499}"'/g' /etc/nginx/sites-available/forward-proxy.conf
+
+echo "**** nginx configuration complete ****"
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/type b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/type
@@ -0,0 +1 @@
+oneshot
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/up b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/4-setup-nginx/run
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/dependencies.d/4-setup-nginx b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/dependencies.d/4-setup-nginx
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/dependencies.d/init-services b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/dependencies.d/init-services
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/run b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/run
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** starting nginx ****"
+/usr/sbin/nginx -g 'daemon off;'
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/type b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/type
@@ -0,0 +1 @@
+longrun
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/up b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/4-setup-nginx/run
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/3-install-transcoder-shim b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/3-install-transcoder-shim
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/4-setup-nginx b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/4-setup-nginx
diff --git a/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/5-run-nginx b/pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/5-run-nginx
diff --git a/pms/extended-image/Dockerfile b/pms/extended-image/Dockerfile
@@ -5,14 +5,18 @@ LABEL maintainer="pabloromeo"
 COPY /docker-mod/root/etc/ /etc/
 COPY /app /app
 
-RUN bash /etc/cont-init.d/92-install-dependencies && \
-    bash /etc/cont-init.d/93-npm-install && \
-    rm /etc/cont-init.d/92-install-dependencies && \
-    rm /etc/cont-init.d/93-npm-install && \
+RUN bash /etc/s6-overlay/s6-rc.d/1-install-dependencies/run && \
+    bash /etc/s6-overlay/s6-rc.d/2-npm-install/run && \
+    rm -rf /etc/s6-overlay/s6-rc.d/1-install-dependencies && \
+    rm -rf /etc/s6-overlay/s6-rc.d/2-npm-install && \
+    rm -rf /etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/dependencies.d && \
+    rm -rf /etc/s6-overlay/s6-rc.d/4-setup-nginx/dependencies.d && \
+    rm /etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies && \
+    rm /etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install && \
     echo "**** cleanup ****" && \
     rm -rf \
-        /tmp/* \
-        /var/lib/apt/lists/* \
-        /var/tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 WORKDIR /
diff --git a/...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies b/...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies
diff --git a/worker/docker-mod/_old_cont-init.d/93-npm-install b/worker/docker-mod/_old_cont-init.d/93-npm-install
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** Running npm install ****"
+cd /app
+npm install
diff --git a/...-mod/root/etc/cont-init.d/94-install-shim → ...cker-mod/_old_cont-init.d/94-install-shim b/...-mod/root/etc/cont-init.d/94-install-shim → ...cker-mod/_old_cont-init.d/94-install-shim
diff --git a/.../root/etc/cont-init.d/95-setup-codecs-dir → ...-mod/_old_cont-init.d/95-setup-codecs-dir b/.../root/etc/cont-init.d/95-setup-codecs-dir → ...-mod/_old_cont-init.d/95-setup-codecs-dir
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/run b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
@@ -0,0 +1,17 @@
+#!/usr/bin/with-contenv bash
+
+if which node > /dev/null
+then
+    echo "**** node is installed, skipping... ****"
+else
+    echo "**** install runtime packages ****"
+    echo "**** apt-get update ****"
+    apt-get update
+    echo "**** install binutils, libatomic1, file, unzip ****"
+    apt-get install -y binutils libatomic1 file unzip
+    echo "**** install 'n' ****"
+    curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
+    echo "**** install nodejs ****"
+    bash n lts
+fi
+
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/type b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/type
@@ -0,0 +1 @@
+oneshot
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/up b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
diff --git a/...ocker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/dependencies.d/1-install-dependencies b/...ocker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/dependencies.d/1-install-dependencies
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/run b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/run
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** Running npm install ****"
+cd /app
+npm install
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/type b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/type
@@ -0,0 +1 @@
+oneshot
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/up b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/2-npm-install/run
diff --git a/...cker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/dependencies.d/1-install-dependencies b/...cker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/dependencies.d/1-install-dependencies
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/run b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/run
@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+if file /usr/lib/plexmediaserver/'Plex Media Server' | grep -iq ASCII ; then
+    echo "**** Root executable is already clusterplex-worker, only update ****"
+else
+    echo "**** Root executable is still original, rename ****"
+    mv /usr/lib/plexmediaserver/'Plex Media Server' /usr/lib/plexmediaserver/pms_original
+fi
+
+echo "**** Move shim to destination ****"
+cp /app/start.sh /usr/lib/plexmediaserver/'Plex Media Server'
+
+echo "**** Make the shim executable ****"
+chmod +x /usr/lib/plexmediaserver/'Plex Media Server'
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/type b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/type
@@ -0,0 +1 @@
+oneshot
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/up b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/3-install-shim/run
diff --git a/...-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/dependencies.d/1-install-dependencies b/...-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/dependencies.d/1-install-dependencies
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/run b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/run
@@ -0,0 +1,13 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** Setting up codecs directory ****"
+if [ -d "/codecs" ]
+then
+    echo "Directory already present"
+else
+    echo "Creating /codecs"
+    mkdir -p /codecs
+fi
+
+echo "**** Changing ownership for /codecs ****"
+chown abc:abc /codecs
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/type b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/type
@@ -0,0 +1 @@
+oneshot
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/up b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/run
diff --git a/...ocker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/1-install-dependencies b/...ocker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/1-install-dependencies
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/2-npm-install b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/2-npm-install
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/3-install-shim b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/3-install-shim
diff --git a/...er/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/4-setup-codecs-dir b/...er/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/4-setup-codecs-dir
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/3-install-shim b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/3-install-shim
diff --git a/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/4-setup-codecs-dir b/worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/4-setup-codecs-dir
diff --git a/worker/extended-image/Dockerfile b/worker/extended-image/Dockerfile
@@ -5,10 +5,16 @@ LABEL maintainer="pabloromeo"
 COPY /docker-mod/root/etc/ /etc/
 COPY /app /app
 
-RUN bash /etc/cont-init.d/92-install-dependencies && \
-    bash /etc/cont-init.d/93-npm-install && \
-    rm /etc/cont-init.d/92-install-dependencies && \
-    rm /etc/cont-init.d/93-npm-install && \
+RUN bash /etc/s6-overlay/s6-rc.d/1-install-dependencies/run && \
+    bash /etc/s6-overlay/s6-rc.d/2-npm-install/run && \
+    rm -rf /etc/s6-overlay/s6-rc.d/1-install-dependencies && \
+    rm -rf /etc/s6-overlay/s6-rc.d/2-npm-install && \
+    rm -rf /etc/s6-overlay/s6-rc.d/3-install-shim/dependencies.d && \
+    rm -rf /etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/dependencies.d && \
+    rm /etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/1-install-dependencies && \
+    rm /etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/2-npm-install && \
+    rm /etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies && \
+    rm /etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install && \
     echo "**** cleanup ****" && \
     rm -rf \
     /tmp/* \