Merge claude/2
This commit is contained in:
commit
38a7e4c365
@ -101,10 +101,17 @@ installDockerRootless()
|
|||||||
local result; result=$(runSystem loginctl enable-linger $CFG_DOCKER_INSTALL_USER)
|
local result; result=$(runSystem loginctl enable-linger $CFG_DOCKER_INSTALL_USER)
|
||||||
checkSuccess "Adding automatic start (linger)"
|
checkSuccess "Adding automatic start (linger)"
|
||||||
|
|
||||||
# Rootless Install
|
# Install rootless Docker and enable the user service, but do NOT
|
||||||
|
# start it here. The rootless network override (override.conf,
|
||||||
|
# written further down) and the daemon-reload that picks it up
|
||||||
|
# haven't happened yet, so a start at this point comes up with no
|
||||||
|
# valid net/port-driver config and fails ("Job for docker.service
|
||||||
|
# failed") — a guaranteed, harmless first-start error that only
|
||||||
|
# noises the error report. The first real start is the
|
||||||
|
# `systemctl --user restart docker` below, once the override is in
|
||||||
|
# place.
|
||||||
rootless_install=$(cat <<EOF
|
rootless_install=$(cat <<EOF
|
||||||
curl -fsSL https://get.docker.com/rootless | sh && \
|
curl -fsSL https://get.docker.com/rootless | sh && \
|
||||||
systemctl --user start docker && \
|
|
||||||
systemctl --user enable docker && \
|
systemctl --user enable docker && \
|
||||||
exit
|
exit
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user