Merge branch 'master' of edugit.org:Teckids/team-sysadmin/docker-images