Skip to content

Commit 74a1f17

Browse files
committed
fix: fixed PR comments
Signed-off-by: Gajesh Bhat <gajeshbht@gmail.com>
1 parent d7bf04c commit 74a1f17

File tree

1 file changed

+33
-34
lines changed

1 file changed

+33
-34
lines changed

install.sh

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,6 @@ set -e
7575
#
7676
# $ sudo sh install-docker.sh --mirror AzureChinaCloud
7777
#
78-
# --start-daemon
79-
#
80-
# Use the --start-daemon option to automatically start and enable the Docker
81-
# daemon service after installation. This option will attempt to start the
82-
# Docker service using the appropriate service management system (systemd,
83-
# etc.) for your distribution:
84-
#
85-
# $ sudo sh install-docker.sh --start-daemon
86-
#
87-
# Note: This option requires appropriate privileges to manage system services.
8878
# --setup-repo
8979
#
9080
# Use the --setup-repo option to configure Docker's package repositories without
@@ -93,6 +83,17 @@ set -e
9383
#
9484
# $ sudo sh install-docker.sh --setup-repo
9585
#
86+
# --autostart
87+
#
88+
# Use the --autostart option to automatically start and enable the Docker
89+
# daemon service after installation. This option will attempt to start the
90+
# Docker service using the appropriate service management system (systemd,
91+
# etc.) for your distribution:
92+
#
93+
# $ sudo sh install-docker.sh --autostart
94+
#
95+
# Note: This option requires appropriate privileges to manage system services.
96+
#
9697
# ==============================================================================
9798

9899

@@ -128,8 +129,8 @@ fi
128129

129130
mirror=''
130131
DRY_RUN=${DRY_RUN:-}
131-
START_DAEMON=${START_DAEMON:-}
132132
REPO_ONLY=${REPO_ONLY:-0}
133+
AUTOSTART=${AUTOSTART:-}
133134
while [ $# -gt 0 ]; do
134135
case "$1" in
135136
--channel)
@@ -143,9 +144,6 @@ while [ $# -gt 0 ]; do
143144
mirror="$2"
144145
shift
145146
;;
146-
--start-daemon)
147-
START_DAEMON=1
148-
;;
149147
--version)
150148
VERSION="${2#v}"
151149
shift
@@ -154,6 +152,9 @@ while [ $# -gt 0 ]; do
154152
REPO_ONLY=1
155153
shift
156154
;;
155+
--autostart)
156+
AUTOSTART=1
157+
;;
157158
--*)
158159
echo "Illegal option $1"
159160
;;
@@ -301,33 +302,27 @@ has_systemd() {
301302

302303
# Start and enable Docker daemon service
303304
start_docker_daemon() {
304-
if is_dry_run; then
305-
echo "# DRY RUN: Would start and enable Docker daemon service"
306-
if has_systemd; then
307-
echo "# DRY RUN: systemctl start docker"
308-
echo "# DRY RUN: systemctl enable docker"
309-
else
310-
echo "# DRY RUN: service docker start"
311-
echo "# DRY RUN: chkconfig docker on (or equivalent)"
312-
fi
313-
return
314-
fi
315-
316305
echo
317306
echo "Starting and enabling Docker daemon service..."
318307

319308
if has_systemd; then
320309
# Use systemd for modern distributions
321-
echo "Using systemd to manage Docker service"
310+
if ! is_dry_run; then
311+
echo "Using systemd to manage Docker service"
312+
fi
322313
(
323314
set -x
324315
$sh_c 'systemctl start docker'
325316
$sh_c 'systemctl enable docker'
326317
)
327-
echo "Docker daemon started and enabled successfully"
318+
if ! is_dry_run; then
319+
echo "Docker daemon started and enabled successfully"
320+
fi
328321
else
329322
# Fallback for older systems without systemd
330-
echo "Using traditional service management"
323+
if ! is_dry_run; then
324+
echo "Using traditional service management"
325+
fi
331326
(
332327
set -x
333328
$sh_c 'service docker start'
@@ -344,10 +339,14 @@ start_docker_daemon() {
344339
$sh_c 'update-rc.d docker defaults'
345340
)
346341
else
347-
echo "Warning: Could not enable Docker service to start on boot"
348-
echo "Please manually configure Docker to start on boot for your system"
342+
if ! is_dry_run; then
343+
echo "Warning: Could not enable Docker service to start on boot"
344+
echo "Please manually configure Docker to start on boot for your system"
345+
fi
346+
fi
347+
if ! is_dry_run; then
348+
echo "Docker daemon started successfully"
349349
fi
350-
echo "Docker daemon started successfully"
351350
fi
352351
echo
353352
}
@@ -654,7 +653,7 @@ do_install() {
654653
fi
655654
$sh_c "DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $pkgs >/dev/null"
656655
)
657-
if [ -n "$START_DAEMON" ]; then
656+
if [ -n "$AUTOSTART" ]; then
658657
start_docker_daemon
659658
fi
660659
echo_docker_as_nonroot
@@ -764,7 +763,7 @@ do_install() {
764763
fi
765764
$sh_c "$pkg_manager $pkg_manager_flags install $pkgs"
766765
)
767-
if [ -n "$START_DAEMON" ]; then
766+
if [ -n "$AUTOSTART" ]; then
768767
start_docker_daemon
769768
fi
770769
echo_docker_as_nonroot

0 commit comments

Comments
 (0)