I have a 30-gallon tank in my garage that has an integrated hand pump. A really nice one that rolls, has a gauge, etc.
When I bought it, specs stated that it could be used for gas, diesel, kerosene, etc. I've only used it for gas, though, but want to begin using it for diesel for a new tractor...