Seems as if we have approximately 2.4 different songs.

Dodgyfolk's version is pretty much verbatim the one that I'm familiar with from an army environment in the late 1960s, though I didn't have the last stanza, and in the third stanza, as is clear from the rhyme scheme, it should be
"And rubbed his wife's left leg with the bottle".

And, as also suggested by the rhyme, we sang
"Old Johnny Bucker was a rare old f*****". But maybe I'm stating the obvious there...