From 6b43274223ca0deac3caa238b3f281b94a577cf9 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Tue, 11 Oct 2022 14:24:28 +0100
Subject: [PATCH] Migrate to s6v3

---
 Dockerfile                                    | 23 ++++++++++++++-----
 Dockerfile.aarch64                            | 22 ++++++++++++++----
 Dockerfile.armhf                              | 22 ++++++++++++++----
 Jenkinsfile                                   |  2 +-
 README.md                                     | 14 +++++------
 jenkins-vars.yml                              |  2 +-
 readme-vars.yml                               |  8 +++----
 .../dependencies.d/init-config                |  0
 .../s6-rc.d/init-bazarr-config/run}           |  0
 .../s6-rc.d/init-bazarr-config/type           |  1 +
 .../s6-overlay/s6-rc.d/init-bazarr-config/up  |  1 +
 .../dependencies.d/init-bazarr-config         |  0
 .../svc-bazarr/dependencies.d/init-services   |  0
 .../s6-rc.d/svc-bazarr/notification-fd        |  1 +
 root/etc/s6-overlay/s6-rc.d/svc-bazarr/run    |  5 ++++
 root/etc/s6-overlay/s6-rc.d/svc-bazarr/type   |  1 +
 .../user/contents.d/init-bazarr-config        |  0
 .../s6-rc.d/user/contents.d/svc-bazarr        |  0
 root/etc/services.d/bazarr/run                | 10 --------
 19 files changed, 73 insertions(+), 39 deletions(-)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/dependencies.d/init-config
 rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-bazarr-config/run} (100%)
 mode change 100644 => 100755
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bazarr-config
 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-bazarr/dependencies.d/init-services
 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd
 create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-bazarr/run
 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-bazarr/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bazarr-config
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-bazarr
 delete mode 100644 root/etc/services.d/bazarr/run

diff --git a/Dockerfile b/Dockerfile
index d752624..faa87ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
+ARG UNRAR_VERSION=6.1.7
 ARG BUILD_DATE
 ARG VERSION
 ARG BAZARR_VERSION
@@ -20,17 +21,27 @@ RUN \
     libffi-dev \
     libxml2-dev \
     libxslt-dev \
+    make \
     python3-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    curl \
     ffmpeg \
     libxml2 \
     libxslt \
     py3-pip \
     python3 \
-    unrar \
     unzip && \
+  echo "**** install unrar from source ****" && \
+  mkdir /tmp/unrar && \
+  curl -o \
+    /tmp/unrar.tar.gz -L \
+    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \  
+  tar xf \
+    /tmp/unrar.tar.gz -C \
+    /tmp/unrar --strip-components=1 && \
+  cd /tmp/unrar && \
+  make && \
+  install -v -m755 unrar /usr/local/bin && \
   echo "**** install bazarr ****" && \
   if [ -z ${BAZARR_VERSION+x} ]; then \
     BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \
@@ -45,11 +56,10 @@ RUN \
     /tmp/bazarr.zip -d \
     /app/bazarr/bin && \
   rm -Rf /app/bazarr/bin/bin && \
-  echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
+  echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \
   echo "**** Install requirements ****" && \
   pip3 install -U --no-cache-dir pip && \
-  pip install lxml --no-binary :all: && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/  -r \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/  -r \
     /app/bazarr/bin/requirements.txt && \
   echo "**** clean up ****" && \
   apk del --purge \
@@ -64,4 +74,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 6767
+
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 822b2c4..e5be544 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,7 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
+ARG UNRAR_VERSION=6.1.7
 ARG BUILD_DATE
 ARG VERSION
 ARG BAZARR_VERSION
@@ -20,17 +21,27 @@ RUN \
     libffi-dev \
     libxml2-dev \
     libxslt-dev \
+    make \
     python3-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    curl \
     ffmpeg \
     libxml2 \
     libxslt \
     py3-pip \
     python3 \
-    unrar \
     unzip && \
+  echo "**** install unrar from source ****" && \
+  mkdir /tmp/unrar && \
+  curl -o \
+    /tmp/unrar.tar.gz -L \
+    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \  
+  tar xf \
+    /tmp/unrar.tar.gz -C \
+    /tmp/unrar --strip-components=1 && \
+  cd /tmp/unrar && \
+  make && \
+  install -v -m755 unrar /usr/local/bin && \
   echo "**** install bazarr ****" && \
   if [ -z ${BAZARR_VERSION+x} ]; then \
     BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \
@@ -45,10 +56,10 @@ RUN \
     /tmp/bazarr.zip -d \
     /app/bazarr/bin && \
   rm -Rf /app/bazarr/bin/bin && \
-  echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
+  echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \
   echo "**** Install requirements ****" && \
   pip3 install -U --no-cache-dir pip && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/  -r \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/  -r \
     /app/bazarr/bin/requirements.txt && \
   echo "**** clean up ****" && \
   apk del --purge \
@@ -63,4 +74,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 6767
+
 VOLUME /config
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 4cf9628..fbeba44 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,6 +1,7 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
+ARG UNRAR_VERSION=6.1.7
 ARG BUILD_DATE
 ARG VERSION
 ARG BAZARR_VERSION
@@ -20,17 +21,27 @@ RUN \
     libffi-dev \
     libxml2-dev \
     libxslt-dev \
+    make \
     python3-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
-    curl \
     ffmpeg \
     libxml2 \
     libxslt \
     py3-pip \
     python3 \
-    unrar \
     unzip && \
+  echo "**** install unrar from source ****" && \
+  mkdir /tmp/unrar && \
+  curl -o \
+    /tmp/unrar.tar.gz -L \
+    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \  
+  tar xf \
+    /tmp/unrar.tar.gz -C \
+    /tmp/unrar --strip-components=1 && \
+  cd /tmp/unrar && \
+  make && \
+  install -v -m755 unrar /usr/local/bin && \
   echo "**** install bazarr ****" && \
   if [ -z ${BAZARR_VERSION+x} ]; then \
     BAZARR_VERSION=$(curl -sX GET https://api.github.com/repos/morpheus65535/bazarr/releases \
@@ -45,10 +56,10 @@ RUN \
     /tmp/bazarr.zip -d \
     /app/bazarr/bin && \
   rm -Rf /app/bazarr/bin/bin && \
-  echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
+  echo "UpdateMethod=docker\nBranch=development\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/bazarr/package_info && \
   echo "**** Install requirements ****" && \
   pip3 install -U --no-cache-dir pip && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/  -r \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/  -r \
     /app/bazarr/bin/requirements.txt && \
   echo "**** clean up ****" && \
   apk del --purge \
@@ -63,4 +74,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 6767
+
 VOLUME /config
diff --git a/Jenkinsfile b/Jenkinsfile
index b78db72..5890aeb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
     CI_AUTH='user:password'
-    CI_WEBPATH=''
+    CI_WEBPATH='/system/status'
   }
   stages {
     // Setup all the basic environment variables needed for the build
diff --git a/README.md b/README.md
index 5f775c2..9ff725d 100644
--- a/README.md
+++ b/README.md
@@ -81,9 +81,9 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-      - </path/to/bazarr/config>:/config
-      - </path/to/movies>:/movies
-      - </path/to/tv:/tv
+      - /path/to/bazarr/config:/config
+      - /path/to/movies:/movies
+      - /path/to/tv:/tv
     ports:
       - 6767:6767
     restart: unless-stopped
@@ -98,9 +98,9 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=Europe/London \
   -p 6767:6767 \
-  -v </path/to/bazarr/config>:/config \
-  -v </path/to/movies>:/movies \
-  -v </path/to/tv:/tv \
+  -v /path/to/bazarr/config:/config \
+  -v /path/to/movies:/movies \
+  -v /path/to/tv:/tv \
   --restart unless-stopped \
   lscr.io/linuxserver/bazarr:development
 ```
@@ -108,7 +108,6 @@ docker run -d \
 You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch.
 Add one of the tags,  if required,  to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development
 The development tag will be the latest commit in the development branch of bazarr.
-HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!!
 
 ## Parameters
 
@@ -233,6 +232,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.10.22:** - Rebase development branch to Alpine 3.16, migrate to s6v3.
 * **15.11.21:** - Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken.
 * **25.10.21:** - Rebase to alpine 3.14. Fix numpy wheel.
 * **22.10.21:** - Added openblas package to prevent numpy error.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 5bc4f08..668af67 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -26,6 +26,6 @@ repo_vars:
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
-  - CI_WEBPATH=''
+  - CI_WEBPATH='/system/status'
 sponsor_links:
   - { name: "Bazarr", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url" }
diff --git a/readme-vars.yml b/readme-vars.yml
index 648e0b7..28a400f 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -20,15 +20,14 @@ optional_block_1_items:
     You can choose between ,using tags, various branch versions of bazarr, no tag is required to remain on the main branch.
     Add one of the tags,  if required,  to the linuxserver/bazarr line of the run/create command in the following format, linuxserver/bazarr:development
     The development tag will be the latest commit in the development branch of bazarr.
-    HOWEVER , USE THE DEVELOPMENT BRANCH AT YOUR OWN PERIL !!!!!!!!!
 
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "</path/to/bazarr/config>", desc: "Bazarr data" }
-  - { vol_path: "/movies", vol_host_path: "</path/to/movies>", desc: "Location of your movies" }
-  - { vol_path: "/tv", vol_host_path: "</path/to/tv", desc: "Location of your TV Shows" }
+  - { vol_path: "/config", vol_host_path: "/path/to/bazarr/config", desc: "Bazarr data" }
+  - { vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of your movies" }
+  - { vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "Location of your TV Shows" }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "6767", internal_port: "6767", port_desc: "Allows HTTP access to the internal webserver." }
@@ -46,6 +45,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "11.10.22:", desc: "Rebase development branch to Alpine 3.16, migrate to s6v3." }
   - { date: "15.11.21:", desc: "Temp fix for lxml on amd64, compile it instead of using official wheel that seems to be broken." }
   - { date: "25.10.21:", desc: "Rebase to alpine 3.14. Fix numpy wheel." }
   - { date: "22.10.21:", desc: "Added openblas package to prevent numpy error." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/dependencies.d/init-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run
old mode 100644
new mode 100755
similarity index 100%
rename from root/etc/cont-init.d/30-config
rename to root/etc/s6-overlay/s6-rc.d/init-bazarr-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up
new file mode 100644
index 0000000..2d0b6ae
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-bazarr-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-bazarr-config/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bazarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bazarr-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/dependencies.d/init-services
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/notification-fd
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run
new file mode 100755
index 0000000..56ca65d
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/run
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 6767" \
+        s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py --no-update --config /config
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type
new file mode 100644
index 0000000..1780f9f
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/svc-bazarr/type
@@ -0,0 +1 @@
+longrun
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bazarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bazarr-config
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-bazarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-bazarr
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run
deleted file mode 100644
index 05019cf..0000000
--- a/root/etc/services.d/bazarr/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-    echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
-    umask ${UMASK_SET}
-fi
-
-exec \
-    s6-setuidgid abc python3 /app/bazarr/bin/bazarr.py \
-    --no-update --config /config