Merge pull request #8 from andrewhsu/fix-service-start
removed starting of service for fedora and centos
This commit is contained in:
Коммит
cf6af1c0d6
2
Makefile
2
Makefile
|
@ -31,4 +31,4 @@ verify-install-%.log: needs_version needs_gitcommit
|
|||
-v $(CURDIR):/v \
|
||||
-w /v \
|
||||
$(subst -,:,$*) \
|
||||
bash verify-docker-install "$(EXPECTED_VERSION)" "$(EXPECTED_GITCOMMIT)" | tee $@
|
||||
/v/verify-docker-install "$(EXPECTED_VERSION)" "$(EXPECTED_GITCOMMIT)" | tee $@
|
||||
|
|
|
@ -486,11 +486,6 @@ do_install() {
|
|||
fi
|
||||
$sh_c "$pkg_manager makecache fast"
|
||||
$sh_c "$pkg_manager install -y -q docker-ce"
|
||||
if [ -d '/run/systemd/system' ]; then
|
||||
$sh_c 'service docker start'
|
||||
else
|
||||
$sh_c 'systemctl start docker'
|
||||
fi
|
||||
)
|
||||
echo_docker_as_nonroot
|
||||
exit 0
|
||||
|
|
Загрузка…
Ссылка в новой задаче