Compare commits

..

No commits in common. "38a7e4c3655a53dabc7f1a1df20a4d4d482b45f8" and "10477a2651d5e9c12f1119aa7ea9a5d33dae6763" have entirely different histories.

View File

@ -101,17 +101,10 @@ 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)"
# Install rootless Docker and enable the user service, but do NOT # Rootless Install
# 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