Update install file to use a local version of pip

This commit is contained in:
englehardt 2018-09-25 12:36:12 -04:00
Родитель b2b1824ae0
Коммит b8f23c9798
3 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -34,6 +34,7 @@ RUN useradd user \
&& echo 'user:secret' | chpasswd
USER user
ENV PATH="/home/user/.local/bin:${PATH}"
#=============================================================
# Install requirements for OpenWPM

Просмотреть файл

@ -472,7 +472,7 @@ After a few minutes, the container is ready to use.
You can run the demo measurement from inside the container, as follows:
mkdir -p docker-volume && docker run -v $PWD/docker-volume:/home/user/ \
mkdir -p docker-volume && docker run -v $PWD/docker-volume:/home/user/Desktop \
-e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix \
-it openwpm python /opt/OpenWPM/demo.py

Просмотреть файл

@ -39,7 +39,7 @@ if [ "$flash" = true ]; then
fi
sudo apt-get update
sudo apt-get install -y firefox htop git python-dev libxml2-dev libxslt-dev libffi-dev libssl-dev build-essential xvfb libboost-python-dev libleveldb-dev libjpeg-dev curl wget python-pip
sudo apt-get install -y firefox htop git python-dev libxml2-dev libxslt-dev libffi-dev libssl-dev build-essential xvfb libboost-python-dev libleveldb-dev libjpeg-dev curl wget
# For some versions of ubuntu, the package libleveldb1v5 isn't available. Use libleveldb1 instead.
sudo apt-get install -y libleveldb1v5 || sudo apt-get install -y libleveldb1
@ -51,7 +51,10 @@ fi
# Check if we're running on continuous integration
# Python requirements are already installed by .travis.yml on Travis
if [ "$TRAVIS" != "true" ]; then
pip install --user -U -r requirements.txt
wget https://bootstrap.pypa.io/get-pip.py
python get-pip.py --user
rm get-pip.py
pip install --user --upgrade -r requirements.txt
fi
# Grab the latest version of Firefox ESR.