Merged in [18900] from rjsparks@nostrum.com:

Tweaks to dockerfile to avoid rust compiler issues.
 - Legacy-Id: 18917
Note: SVN reference [18900] has been migrated to Git commit acefcb298c

docker/docker-init.sh

@@ -112,6 +112,7 @@ echo "Activating the virtual python environment ..."
 
 if ! $VIRTDIR/bin/python -c "import django"; then
     echo "Installing requirements ..."
+    pip install --upgrade pip
     reqs=/home/$USER/$CWD/requirements.txt
     if [ ! -f $reqs ]; then
         echo "   Using $reqs"
@@ -188,4 +189,6 @@ else
     echo "LANG=$LANG"
 fi
 
+HOME=/opt/home/$USER
+
 su -p $USER