WIP: funcion/emprolijar-docker #53

Draft
atasistro wants to merge 6 commits from funcion/emprolijar-docker into master

6 commits