Merge "Adding docker build options"