Merge branch 'contrib-docker-update' into 'master'

contrib/docker: update

See merge request !55
5 jobs for master
in 1 minute and 23 seconds and was queued for 6 seconds