Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migration to s6-overlay v3 and nginx listen ports for ipv4 and ipv6 #326

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Migration to s6-overlay v3 and nginx listen ports for ipv4 and ipv6 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1459ab
fix: migrating s6-overlay to v3
pabloromeo Jul 23, 2024
90c3027
Update forward-proxy.conf
pabloromeo Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies
View file
Open in desktop
File renamed without changes.
0 ...r-mod/root/etc/cont-init.d/93-npm-install → ...ocker-mod/_old_cont-init.d/93-npm-install
View file
Open in desktop
File renamed without changes.
0 ...tc/cont-init.d/94-install-transcoder-shim → ...ld_cont-init.d/94-install-transcoder-shim
View file
Open in desktop
File renamed without changes.
0 ...r-mod/root/etc/cont-init.d/95-setup-nginx → ...ocker-mod/_old_cont-init.d/95-setup-nginx
View file
Open in desktop
File renamed without changes.
0 pms/docker-mod/root/etc/services.d/nginx/run → pms/docker-mod/_old_services.d/nginx/run
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion pms/docker-mod/root/etc/nginx/sites-available/forward-proxy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
16 changes: 16 additions & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
Empty file added ...ocker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
0 ...r-mod/root/etc/cont-init.d/93-npm-install → .../etc/s6-overlay/s6-rc.d/2-npm-install/run
100644 → 100755
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/2-npm-install/run
Empty file added ...ot/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
17 changes: 17 additions & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/3-install-transcoder-shim/run
Empty file added ...ocker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
15 changes: 15 additions & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ****"
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-nginx/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/4-setup-nginx/run
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/dependencies.d/4-setup-nginx
View file
Open in desktop
Empty file.
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/dependencies.d/init-services
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/with-contenv bash

echo "**** starting nginx ****"
/usr/sbin/nginx -g 'daemon off;'
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
longrun
1 change: 1 addition & 0 deletions pms/docker-mod/root/etc/s6-overlay/s6-rc.d/5-run-nginx/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/4-setup-nginx/run
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies
View file
Open in desktop
Empty file.
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install
View file
Open in desktop
Empty file.
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/3-install-transcoder-shim
View file
Open in desktop
Empty file.
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/4-setup-nginx
View file
Open in desktop
Empty file.
Empty file added pms/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/5-run-nginx
View file
Open in desktop
Empty file.
18 changes: 11 additions & 7 deletions pms/extended-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /
0 ...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions worker/docker-mod/_old_cont-init.d/93-npm-install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/with-contenv bash

echo "**** Running npm install ****"
cd /app
npm install
0 ...-mod/root/etc/cont-init.d/94-install-shim → ...cker-mod/_old_cont-init.d/94-install-shim
View file
Open in desktop
File renamed without changes.
0 .../root/etc/cont-init.d/95-setup-codecs-dir → ...-mod/_old_cont-init.d/95-setup-codecs-dir
View file
Open in desktop
File renamed without changes.
17 changes: 17 additions & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/1-install-dependencies/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/1-install-dependencies/run
Empty file added ...ocker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/with-contenv bash

echo "**** Running npm install ****"
cd /app
npm install
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/2-npm-install/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/2-npm-install/run
Empty file added ...cker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
14 changes: 14 additions & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/3-install-shim/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/3-install-shim/run
Empty file added ...-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/type
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oneshot
1 change: 1 addition & 0 deletions worker/docker-mod/root/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/up
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/run
Empty file added ...ocker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/1-install-dependencies
View file
Open in desktop
Empty file.
Empty file added worker/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/2-npm-install
View file
Open in desktop
Empty file.
Empty file added worker/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/3-install-shim
View file
Open in desktop
Empty file.
Empty file added ...er/docker-mod/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/4-setup-codecs-dir
View file
Open in desktop
Empty file.
Empty file added worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies
View file
Open in desktop
Empty file.
Empty file added worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install
View file
Open in desktop
Empty file.
Empty file added worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/3-install-shim
View file
Open in desktop
Empty file.
Empty file added worker/docker-mod/root/etc/s6-overlay/s6-rc.d/user/contents.d/4-setup-codecs-dir
View file
Open in desktop
Empty file.
14 changes: 10 additions & 4 deletions worker/extended-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/* \
Expand Down