You should be able to fill an empty bottle with water by wielding it and triggering a rust trap until your wield slot gets splashed. Or, more generally, any time an empty bottle would take water damage, it should become a potion of water.