Skip to content

Commit d97f8ab

Browse files
authored
Merge pull request #119 from zelahi/docker-rootless-bin-folder
Docker rootless bin folder
2 parents 8f03fee + c5cd433 commit d97f8ab

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

rootless-install.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ SCRIPT_COMMIT_SHA=UNKNOWN
1818
set -e
1919

2020
init_vars() {
21-
BIN="$HOME/bin"
21+
BIN="${DOCKER_BIN:-$HOME/bin}"
22+
2223
DAEMON=dockerd
2324
SYSTEMD=
2425
if systemctl --user daemon-reload >/dev/null 2>&1; then
@@ -185,9 +186,9 @@ start_docker() {
185186
fi
186187

187188
mkdir -p $HOME/.config/systemd/user
188-
189+
189190
DOCKERD_FLAGS="--experimental"
190-
191+
191192
if [ -n "$SKIP_IPTABLES" ]; then
192193
DOCKERD_FLAGS="$DOCKERD_FLAGS --iptables=false"
193194
fi
@@ -211,8 +212,8 @@ Description=Docker Application Container Engine (Rootless)
211212
Documentation=https://docs.docker.com
212213
213214
[Service]
214-
Environment=PATH=$HOME/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
215-
ExecStart=$HOME/bin/dockerd-rootless.sh $DOCKERD_FLAGS
215+
Environment=PATH=$BIN:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
216+
ExecStart=$BIN/dockerd-rootless.sh $DOCKERD_FLAGS
216217
ExecReload=/bin/kill -s HUP \$MAINPID
217218
TimeoutSec=0
218219
RestartSec=2

0 commit comments

Comments
 (0)