From c5cd4331081ca80143d35c031fa25f1e65d13246 Mon Sep 17 00:00:00 2001 From: zelahi Date: Wed, 22 May 2019 16:12:36 -0700 Subject: [PATCH] ADDED configurable BIN folder FIXED systemd unit file to take in user provided path Signed-off-by: zelahi --- rootless-install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rootless-install.sh b/rootless-install.sh index d37d255c..7ac5ed7c 100755 --- a/rootless-install.sh +++ b/rootless-install.sh @@ -18,7 +18,8 @@ SCRIPT_COMMIT_SHA=UNKNOWN set -e init_vars() { - BIN="$HOME/bin" + BIN="${DOCKER_BIN:-$HOME/bin}" + DAEMON=dockerd SYSTEMD= if systemctl --user daemon-reload >/dev/null 2>&1; then @@ -185,9 +186,9 @@ start_docker() { fi mkdir -p $HOME/.config/systemd/user - + DOCKERD_FLAGS="--experimental" - + if [ -n "$SKIP_IPTABLES" ]; then DOCKERD_FLAGS="$DOCKERD_FLAGS --iptables=false" fi @@ -211,8 +212,8 @@ Description=Docker Application Container Engine (Rootless) Documentation=https://docs.docker.com [Service] -Environment=PATH=$HOME/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ExecStart=$HOME/bin/dockerd-rootless.sh $DOCKERD_FLAGS +Environment=PATH=$BIN:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ExecStart=$BIN/dockerd-rootless.sh $DOCKERD_FLAGS ExecReload=/bin/kill -s HUP \$MAINPID TimeoutSec=0 RestartSec=2