Which cruise terminal in Marseille?

[vival]

Does anyone know which cruise terminal the Marina docks at in Marseille? We were there on the Regatta last year and were in Joliette which was very pleasant but suspect that Marina may be too big for there and use the main port.

[ShopperfiendTO]

On Riviera last year we docked at the big industrial one far from the inner harbour (where the little "train" starts). Pretty sure that this is where you'll end up as well.