merged local and remote docker funcitonality