You can use a 40oz bottle and just tell yourself you will finish it by a certain time. It works the same way as a gallon but it is easier to carry around! Just try to drink at least three of them throughout the day!
I usually tell my clients that the other liquids they are drinking are bonus and don't count towards the gallon. Things like coffee and tea are totally fine but I would suggest not counting them towards your desired goal.