Merge branch 'hotfix/20190815-1'

pip.conf moved to system wide config location

Dockerfile

@@ -44,35 +44,37 @@ RUN useradd --create-home --shell /bin/bash $USERNAME && \
     npm i --global diff-so-fancy
 ADD gitconfig $HOMEDIR/.config/git/config
 RUN chown -R $USERNAME:$USERNAME $HOMEDIR/.config
+RUN printf "docky ALL=(ALL) ALL\n\
+Defaults:$USERNAME !authenticate,!pam_session,env_reset\n" > /etc/sudoers.d/$USERNAME\
+    && chmod 0440 /etc/sudoers.d/$USERNAME
 
 ENV SOURCEDIR=/src \
     BUILDOUTPUTDIR=/generated \
     VENVDIR=$HOMEDIR/.v27scons \
     BASH_ENV=$HOMEDIR/.bash_aliases
 
+RUN printf "[global]\n\
+timeout=60\n\
+index-url=https://pypi.org/simple\n\
+extra-index-url=https://devpi.coast-project.org/coast/CoastSconsider/+simple\n\
+" > /etc/pip.conf
+
 USER $USERNAME
 
 RUN git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
 
-RUN mkdir -p ~/.pip && \
-    printf "[global]\n\
-index-url=https://pypi.python.org/simple\n\
-extra-index-url=https://devpi.coast-project.org/coast/CoastSconsider/+simple\n\
-" > ~/.pip/pip.conf \
+RUN mkdir -p ~/.pip\
     && sed -i -r '/^case \$-/,/^esac/ d' $HOMEDIR/.bashrc\
     && echo "test -d \"\$VENVDIR\" && . \$VENVDIR/bin/activate" >> $HOMEDIR/.bash_aliases
 
-RUN virtualenv $VENVDIR \
-    && . $VENVDIR/bin/activate \
+RUN virtualenv $VENVDIR\
+    && . $VENVDIR/bin/activate\
     && pip install --upgrade pip
 
 USER root
 
 ADD entrypoint.sh /entrypoint.sh
 COPY entrypoint-init.d /entrypoint-init.d
-RUN printf "docky ALL=(ALL) ALL\n\
-Defaults:$USERNAME !authenticate,!pam_session,env_reset\n" > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME
 
 RUN mkdir -p -m 1777 $SOURCEDIR $BUILDOUTPUTDIR