From 111989bb352d6281c879246013e4cbc3659a831b Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Sun, 9 Jul 2017 17:11:43 +0000 Subject: [PATCH 1/2] removed starting of service for fedora and centos Running install.sh inside docker container, receiving error message: Failed to get D-Bus connection: Operation not permitted Even though the rpm is successfully installed. In rpm world, should not start systemd service after install of rpm package if the service is not already started before install, which is the case for first install of the package. Signed-off-by: Andrew Hsu --- install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/install.sh b/install.sh index cd34485..8bf5396 100644 --- a/install.sh +++ b/install.sh @@ -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 From 006a30aa8382205f8d29d97fd97096ed87f5932f Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Sun, 9 Jul 2017 17:43:01 +0000 Subject: [PATCH 2/2] execute verify-docker-install straight-up to use setopt By executing `bash verify-docker-install`, the `bash -e` at the top of the script is not honored. Should just execute the script straight-up to use whatever `set` options are desired in the script. Signed-off-by: Andrew Hsu --- Makefile | 2 +- verify-docker-install | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 verify-docker-install diff --git a/Makefile b/Makefile index 32b57a7..3dbc3e1 100644 --- a/Makefile +++ b/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 $@ diff --git a/verify-docker-install b/verify-docker-install old mode 100644 new mode 100755