Merge "Dockerize the service"