Fix hack/make/ubuntu to install both docker.service and docker.socket

As discussed on #7021