From 66a159a8174ed722b8b36b5918aab7ef8f81281b Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Mon, 21 Feb 2022 03:58:44 +0000 Subject: [PATCH] update docker files for .14 --- docker/Makefile | 4 ++-- docker/root/etc/services.d/tdarr_node/run | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index d430700..b28fcd7 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -3,8 +3,8 @@ REPO=_acc TAG=dev VERSION=2.00.14 # PLATFORMS=linux/amd64 -PLATFORMS=linux/amd64,linux/arm/v7 -# PLATFORMS=linux/amd64,linux/arm64,linux/arm/v7 +# PLATFORMS=linux/amd64,linux/arm/v7 +PLATFORMS=linux/amd64,linux/arm64,linux/arm/v7 build-server: docker buildx build -f Dockerfile -t ${USERNAME}/tdarr${REPO}:${TAG} --build-arg VERSION=$(VERSION) --build-arg MODULE=Tdarr_Server --platform ${PLATFORMS} --push . diff --git a/docker/root/etc/services.d/tdarr_node/run b/docker/root/etc/services.d/tdarr_node/run index e0b46de..135e270 100644 --- a/docker/root/etc/services.d/tdarr_node/run +++ b/docker/root/etc/services.d/tdarr_node/run @@ -1,7 +1,13 @@ #!/usr/bin/with-contenv bash -echo "Starting Tdarr_Node" - cd /app/Tdarr_Node || exit 1 -exec s6-setuidgid Tdarr ./Tdarr_Node +if [ -d "/etc/services.d/tdarr_server" ] && [ "$internalNode" = true ]; then \ + echo "Starting Tdarr_Node" + exec s6-setuidgid Tdarr ./Tdarr_Node +fi + +if [ ! -d "/etc/services.d/tdarr_server" ]; then \ + echo "Starting Tdarr_Node" + exec s6-setuidgid Tdarr ./Tdarr_Node +fi