Rewrote the ENTRYPOINT section in builder

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Merge pull request #6988 from jamtur01/entry

Rewrote the ENTRYPOINT section in builder