I think it will be a long time (100 years) until ICE's get replaced in semi trucks and container ships. The energy storage requirements are massive, and batteries for such applications have a much harder time justifying themselves.
About the only viable green solution for container ships is going back to sails. Some ships already fly sails (really kites) to reduce their fuel costs, but it's not practical as the ship's only propulsion.
The best solution is probably to switch ships over to burning natural gas or biodiesel instead of filthy heavy fuel oil, but the cost structure is all wrong for this right now.