I use the well-known/basic Scepter jerry cans for diesel, gas and water.
They are affordable and come in many sizes/shapes.
Being standardized also means not worrying about which threading my cans have when buying attachments or replacement caps, etc.
I don't use the spout thing from them (except a 2-gal gas can and the newer design actually works well) - most replaced with a standard cap.
The original spouts have been handy when cut down a bit and reversed (the old-style horrible ones, not the newer one with the lever) - makes it easy to slide a hose or pipe into the can and holds it in place fairly well. I have one of those cut down that way for each diesel and water. They stay 'spout down' in the can (I have three diesel and three water) and I can tell which can has it since that can does not have a standard cap.
EDIT: Now that I think about it, I don't use the 'spout down' setup to hold the hose/pipe in the can with the newer diesel transfer pump. That was setup for use with the older pump and manual siphoning. Newer pump goes directly onto the can itself.
Specifically for diesel:
I have both a siphon and a battery powered electric fuel transfer pump.
I started with just the manual siphon and bought the pump a year or so later.
The pump is much faster and easier to use and easy to stop if you are doing something like filling a small tank for a diesel heater.
It takes standard AA batteries, which I have an assortment of rechargeable ones around for various things anyway.
I haven't used the transfer pump in a couple years, but it was from Amazon and something like this:
I had a different one before and that eventually died and I was never super happy with it anyway.
This was ~5 years ago, but I remember when I bought this one and being a little hesitant about the price, but being very happy with the purchase compared to the other one after putting it to use.
Diesel is messy, smelly, slippery and a big no-no to spill into the water.
The transfer pump has significantly reduced the risk and hassles related to all of that.
It also means both myself and the jerry can are safely seated in the cockpit while doing fuel transfers.
I store all the scepter can related equipment in draw-string clear plastic shoe bags. Separate bags for diesel, water, never-used.
The two diesel shoe bags also get fuel absorbant mats stuffed in to deal with any drippings, and get changed out every couple years.
For gasoline I just have the 2-gallon can and no 'extras' so no shoe bag needed.