A couple of years ago the 7-Eleven in T1 would sell drinks into a "LAG" bag you could take onboard - but I don't think they do this anymore sadly
There will indeed be a fountain before boarding where you can fill with perfectly safe chilled water - this is what I do.