"Autoupdate" feature. Update S6. Shellcheck.

Dockerfile

@@ -1,32 +1,54 @@
-FROM ubuntu:20.04
-
-ARG S6_OVERLAY_VERSION=v2.2.0.3
-ARG S6_OVERLAY_ARCH=amd64
+FROM ubuntu:22.04 as base-amd64
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=x86_64
 ARG PLEX_BUILD=linux-x86_64
-ARG PLEX_DISTRO=debian
-ARG DEBIAN_FRONTEND="noninteractive"
 ARG INTEL_NEO_VERSION=20.48.18558
 ARG INTEL_IGC_VERSION=1.0.5699
 ARG INTEL_GMMLIB_VERSION=20.3.2
-ENV TERM="xterm" LANG="C.UTF-8" LC_ALL="C.UTF-8"
 
-ENTRYPOINT ["/init"]
+FROM arm64v8/ubuntu:22.04 as base-arm64
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=aarch64
+ARG PLEX_BUILD=linux-aarch64
+
+FROM arm32v7/ubuntu:22.04 as base-arm
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=arm
+ARG PLEX_BUILD=linux-armv7hf_neon
+
+FROM i386/ubuntu:18.04 as base-386
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=i686
+ARG PLEX_BUILD=linux-x86
+
+FROM base-${TARGETARCH} AS plex
+ARG TARGETARCH
+RUN echo Building pms-docker for ${TARGETARCH}
+
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG PLEX_DISTRO=debian
 
 RUN \
 # Update and get dependencies
     apt-get update && \
     apt-get install -y \
       tzdata \
       curl \
+      xz-utils \
       xmlstarlet \
       uuid-runtime \
       unrar \
+      cron \
+      multitail \
     && \
     \
 # Fetch and extract S6 overlay
-    curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \
-    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / --exclude='./bin' && \
-    tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C /usr ./bin && \
+    curl -L -s \
+        "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jxpf - -C / \
+    && \
+    curl -L -s \
+        "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz" | tar Jxpf - -C / \
+    && \
     \
 # Add user
     useradd -U -d /config -s /bin/false plex && \
@@ -49,16 +71,35 @@ RUN \
 EXPOSE 32400/tcp 8324/tcp 32469/tcp 1900/udp 32410/udp 32412/udp 32413/udp 32414/udp
 VOLUME /config /transcode
 
-ENV CHANGE_CONFIG_DIR_OWNERSHIP="true" \
-    HOME="/config"
-
-ARG TAG=beta
+# TAG can be "autoupdate" or an explicit version, like 1.32.4.7195-7c8f9d3b6
+ARG TAG="autoupdate"
 ARG URL=
+ARG DEBUG=
+
+ENV CHANGE_CONFIG_DIR_OWNERSHIP="true" \
+    HOME="/config" \
+# Note, only used for images built with TAG=autoupdate
+    AUTO_UPDATE_CHANNEL="beta" \
+    \
+    TERM="xterm" \
+    LANG="C.UTF-8" \
+    LC_ALL="C.UTF-8" \
+    \
+    S6_KEEP_ENV=1 \
+    S6_SERVICES_GRACETIME=10000 \
+    S6_KILL_GRACETIME=5000 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 COPY root/ /
 
 RUN \
 # Save version and install
-    /installBinary.sh
+    /installBinary.sh \
+    && \
+# Clean up installer
+    rm /installBinary.sh
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 CMD /healthcheck.sh || exit 1
+
+ENTRYPOINT ["/init"]

README.md

@@ -94,7 +94,10 @@ The provided `docker-compose` templates use the `plexinc/pms-docker` image which
 To use `docker-compose` with ARM devices, you must first build one of the ARM images locally.
 
 ```sh
-docker build -t plexinc/pms-docker:latest -f Dockerfile.armv7 . # or arm64
+# arm 32 bit
+docker build --platform linux/arm/v7 -t plexinc/pms-docker:latest  .
+# arm 64 bit
+docker build --platform linux/arm64 -t plexinc/pms-docker:latest  .
 ```
 
 Then you can `docker-compose up`.
@@ -138,9 +141,14 @@ uid=1001(myuser) gid=1001(myuser) groups=1001(myuser)
 In the above case, if you set the `PLEX_UID` and `PLEX_GID` to `1001`, then the permissions will match that of your own user.
 
 ## Tags
-In addition to the standard version and `latest` tags, two other tags exist: `beta` and `public`. These two images behave differently than your typical containers.  These two images do **not** have any Plex Media Server binary installed.  Instead, when these containers are run, they will perform an update check and fetch the latest version, install it, and then continue execution.  They also run the update check whenever the container is restarted.  To update the version in the container, simply stop the container and start container again when you have a network connection. The startup script will automatically fetch the appropriate version and install it before starting the Plex Media Server.
+In addition to the standard version and `latest` tags, there is a special `autoupdate` tag. This container behaves differently than typical containers.  The `autoupdate` container does **not** have any Plex Media Server binary installed.  Instead, every time this container is run, it checks to see if the server is installed. If it is (because you've already started this container before) it starts the server. If it wasn't installed (because this is the first time the server is starting) it will install it, then start the server.
 
-The `public` restricts this check to public versions only where as `beta` will fetch beta versions.  If the server is not logged in or you do not have Plex Pass on your account, the `beta` tagged images will be restricted to publicly available versions only.
+The `autoupdate` container will automatically check for new updates every day between 4:00am - 4:30am (according to timezone set in `TZ`).
+
+- **AUTO_UPDATE_CHANNEL** This variable can only be `public` or `beta` (default). The `public` value restricts this check to public versions only whereas `beta` value will fetch beta versions.  If the server is not logged in or you do not have Plex Pass on your account, the `beta` tagged images will be restricted to publicly available versions only.
+
+### Forcing an update/install on startup
+- Create an empty file called `_force_` in the `/config` directory. (i.e. `touch /config/_force_`) You can also manually force an update by simply recreating the image. Just restarting the container (or stopping and starting) will not normally update the existing installation within the container.
 
 To view the Docker images head over to [https://hub.docker.com/r/plexinc/pms-docker/tags/](https://hub.docker.com/r/plexinc/pms-docker/tags/)
 
@@ -158,11 +166,18 @@ If you wish to migrate an existing directory to the docker config directory:
 - Note: by default Plex will claim ownership of the entire contents of the `config` dir (see CHANGE_CONFIG_DIR_OWNERSHIP for more information).  As such, there should be nothing in that dir that you do not wish for Plex to own.
 
 ## Useful information
-- Start the container: `docker start plex`
-- Stop the container: `docker stop plex`
-- Shell access to the container while it is running: `docker exec -it plex /bin/bash`
-- See the logs given by the startup script in real time: `docker logs -f plex`
-- Restart the application and upgrade to the latest version: `docker restart plex`
+- Start the container:
+  - `docker start plex`
+- Stop the container:
+  - `docker stop plex`
+- Shell access to the container while it is running:
+  - `docker exec -it plex /bin/bash`
+- See the logs given by the startup script in real time:
+  - `docker logs -f plex`
+- Monitor all Plex Media Server logs:
+  - `docker exec -it plex /plex-logs.sh`
+- Restart the application:
+  - `docker restart plex`
 
 ## Fedora, CentOS, Red Hat
 

dev/README.md

@@ -0,0 +1,45 @@
+# Dev Helper Scripts
+
+Hey homelab enthusiast!
+
+Unless you are enhancing these Dockerfile themselves, please ignore all the files here. In fact, your environment may be very different and these scripts may not work at all. These are just provided only as a reference/starting point so you don't have to start from scratch.
+
+You might just consider extending the images here. i.e.
+
+```
+FROM plexinc/pms-docker:latest
+
+RUN echo "Add your modifications here"
+```
+
+Otherwise, `dev.sh` will build all of the multi-platform docker images, for each platform it will build one that uses a specific version, and `autoupdate` version that doesn't bake the binary into the image, but rather downloads when container boots. Look inside the script for more info.
+
+`docker-bake.hcl` is a buildx bake file that will build all platforms, using pre-installed binaries and `update` versions. This bake file will push to dockerhub. You can override the destination using the `dockerhub_image` variable in `dev.sh`.
+
+
+### Examples
+
+#### Prereqs:
+- [docker](https://docs.docker.com/engine/install/)
+- [buildx](https://github.com/docker/buildx)
+- x86 based linux host
+
+```sh
+# sets up buildx for multi-arch builds
+./dev.sh setup
+
+# bake - build all and push to dockerhub
+./dev.sh bake
+
+# build  version-specific and autoupdate image for amd64
+./dev.sh build amd64
+
+# build everything
+./dev.sh buildall
+
+# launches version-specific container
+./dev.sh debug amd64
+
+# launches auto-update container
+./dev.sh debug amd64 autoupdate
+```