NXIO-361 align dockerfile with master