Finish docker support