Merge "Add USER to the docker environment" am: e3bb8e10dc

am: 5aac651374

Change-Id: If83def12536be0452a5c80eec6065cb2a811b45b

tools/docker/Dockerfile

@@ -21,5 +21,6 @@ RUN groupadd -g $groupid $username \
 COPY gitconfig /home/$username/.gitconfig
 RUN chown $userid:$groupid /home/$username/.gitconfig
 ENV HOME=/home/$username
+ENV USER=$username
 
 ENTRYPOINT chroot --userspec=$(cat /root/username):$(cat /root/username) / /bin/bash -i