summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>2023-04-06 13:58:19 +0900
committerAkihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>2023-04-07 10:08:16 +0900
commit09fbbd56774f579dae9a5554c5864879fe9381c8 (patch)
treec8a71985c9c1a39de405b9ff38f84bf5460c3e6c
parent4ca4705bf777c5c9e432f9a5d7d2926a37788a69 (diff)
downloaddocker-09fbbd56774f579dae9a5554c5864879fe9381c8.tar.gz
docker-rootless-setuptools.sh: improve readability of messages
Before: ```console $ docker-rootless-setuptool.sh install ... [INFO] Use CLI context "rootless" Current context is now "rootless" [INFO] Make sure the following environment variables are set (or add them to ~/.bashrc): export PATH=/usr/local/bin:$PATH Some applications may require the following environment variable too: export DOCKER_HOST=unix:///run/user/1001/docker.sock ``` After: ```console $ docker-rootless-setuptool.sh install ... [INFO] Using CLI context "rootless" Current context is now "rootless" [INFO] Make sure the following environment variable(s) are set (or add them to ~/.bashrc): export PATH=/usr/local/bin:$PATH [INFO] Some applications may require the following environment variable too: export DOCKER_HOST=unix:///run/user/1001/docker.sock ``` Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 4aa2876c75f29962c10f9ae033ed01092fc2946b) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
-rwxr-xr-xcontrib/dockerd-rootless-setuptool.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/dockerd-rootless-setuptool.sh b/contrib/dockerd-rootless-setuptool.sh
index 220c23cc9f..c82bbc8460 100755
--- a/contrib/dockerd-rootless-setuptool.sh
+++ b/contrib/dockerd-rootless-setuptool.sh
@@ -390,18 +390,18 @@ cmd_entrypoint_install() {
cli_ctx_create "${CLI_CONTEXT}" "unix://${XDG_RUNTIME_DIR}/docker.sock" "Rootless mode"
fi
- INFO "Use CLI context \"${CLI_CONTEXT}\""
+ INFO "Using CLI context \"${CLI_CONTEXT}\""
cli_ctx_use "${CLI_CONTEXT}"
echo
- INFO "Make sure the following environment variables are set (or add them to ~/.bashrc):"
- echo
+ INFO "Make sure the following environment variable(s) are set (or add them to ~/.bashrc):"
if [ -n "$XDG_RUNTIME_DIR_CREATED" ]; then
echo "# WARNING: systemd not found. You have to remove XDG_RUNTIME_DIR manually on every logout."
echo "export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}"
fi
echo "export PATH=${BIN}:\$PATH"
- echo "Some applications may require the following environment variable too:"
+ echo
+ INFO "Some applications may require the following environment variable too:"
echo "export DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/docker.sock"
echo
@@ -433,7 +433,7 @@ cmd_entrypoint_uninstall() {
unset DOCKER_HOST
unset DOCKER_CONTEXT
cli_ctx_use "default"
- INFO 'Configured CLI use the "default" context.'
+ INFO 'Configured CLI to use the "default" context.'
INFO
INFO 'Make sure to unset or update the environment PATH, DOCKER_HOST, and DOCKER_CONTEXT environment variables if you have added them to `~/.bashrc`.'
INFO "This uninstallation tool does NOT remove Docker binaries and data."