Change initial part of docker-base to be like othe rcontainers