Merge "Add docker definition for k8s"