Dockerfile cleanup; better user/pass handling in script