From 5f67c1a72b982fc4057e2f6e4803324d3be1330a Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 12 Oct 2017 17:37:36 +0200 Subject: xds-server is now start as user systemd service. Signed-off-by: Sebastien Douheret --- scripts/xds-docker-create-container.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) mode change 100644 => 100755 scripts/xds-docker-create-container.sh (limited to 'scripts') diff --git a/scripts/xds-docker-create-container.sh b/scripts/xds-docker-create-container.sh old mode 100644 new mode 100755 index 13ebb71..e29d7ec --- a/scripts/xds-docker-create-container.sh +++ b/scripts/xds-docker-create-container.sh @@ -166,20 +166,19 @@ echo " ssh -p $SSH_PORT $DOCKER_USER@localhost" ### User / Group id if ($UPDATE_UID); then echo "Setup docker user and group id to match yours" - docker exec -t ${NAME} bash -c "systemctl stop xds-server" || exit 1 + docker exec -t ${NAME} bash -c "systemctl --user stop xds-server" || exit 1 docker exec -t ${NAME} bash -c "usermod -u $(id -u) $DOCKER_USER && groupmod -g $(id -g) $DOCKER_USER" || exit 1 docker exec -t ${NAME} bash -c "chown -R $DOCKER_USER:$DOCKER_USER /home/$DOCKER_USER /tmp/xds*" || exit 1 - docker exec -t ${NAME} bash -c "systemctl start xds-server" || exit 1 - docker exec -t ${NAME} bash -c "systemctl start xds-server" || exit 1 + docker exec -t ${NAME} bash -c "systemctl --user start xds-server" || exit 1 fi ### Force xds-server restart if ($FORCE_RESTART); then echo "Stopping xds-server..." - docker exec -t ${NAME} bash -c "systemctl stop xds-server" || exit 1 + docker exec -t ${NAME} bash -c "systemctl --user stop xds-server" || exit 1 sleep 1 echo "Starting xds-server..." - docker exec -t ${NAME} bash -c "systemctl start xds-server" || exit 1 + docker exec -t ${NAME} bash -c "systemctl --user start xds-server" || exit 1 fi echo "Done, docker container $NAME is ready to be used." -- cgit 1.2.3-korg