From 62cbb88207c7807aef2d42f6e875fe651cb655d8 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 29 Jan 2024 18:21:14 -0800 Subject: [PATCH] install: ensure local/docker services cant run concurrently --- install/docker/install-scrypted-docker-compose.sh | 4 ++++ install/local/install-scrypted-dependencies-linux.sh | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/install/docker/install-scrypted-docker-compose.sh b/install/docker/install-scrypted-docker-compose.sh index 1e9817ac6..69f432229 100755 --- a/install/docker/install-scrypted-docker-compose.sh +++ b/install/docker/install-scrypted-docker-compose.sh @@ -26,6 +26,10 @@ then fi fi +echo "Stopping local service if it is running..." +systemctl stop scrypted.service 2> /dev/null +systemctl disable scrypted.service 2> /dev/null + USER_HOME=$(eval echo ~$SERVICE_USER) SCRYPTED_HOME=$USER_HOME/.scrypted mkdir -p $SCRYPTED_HOME diff --git a/install/local/install-scrypted-dependencies-linux.sh b/install/local/install-scrypted-dependencies-linux.sh index cb8ab8267..0ed8019cb 100755 --- a/install/local/install-scrypted-dependencies-linux.sh +++ b/install/local/install-scrypted-dependencies-linux.sh @@ -89,6 +89,13 @@ USER_HOME=$(eval echo ~$SERVICE_USER) echo "Setting permissions on $USER_HOME/.scrypted" chown -R $SERVICE_USER $USER_HOME/.scrypted +echo "Stopping docker service if it exists..." +cd $USER_HOME/.scrypted +echo "docker compose down" +sudo -u $SERVICE_USER docker compose down 2> /dev/null +echo "docker compose rm -rf" +sudo -u $SERVICE_USER docker rm -f /scrypted /scrypted-watchtower 2> /dev/null + echo "Installing Scrypted..." RUN sudo -u $SERVICE_USER npx -y scrypted@latest install-server