зеркало из https://github.com/openwpm/OpenWPM.git
removed python2 from scripts and dockerfile
This commit is contained in:
Родитель
74b629eee7
Коммит
d8cbfee8bf
10
Dockerfile
10
Dockerfile
|
@ -34,17 +34,13 @@ RUN ./install-system.sh --no-flash
|
|||
RUN mv firefox-bin /opt/firefox-bin
|
||||
ENV FIREFOX_BINARY /opt/firefox-bin/firefox-bin
|
||||
|
||||
# Instead of running install-pip-and-packages.sh, the packages are installed
|
||||
# manually using pip and pip3 so that python2 and python3 are supported in the
|
||||
# final image.
|
||||
RUN apt-get -y install python-pip python3-pip
|
||||
|
||||
# For some reasons, python3-publicsuffix doesn't work with pip3 at the moment,
|
||||
# so install it from the ubuntu repository
|
||||
RUN apt-get -y install python3-publicsuffix
|
||||
|
||||
COPY requirements.txt .
|
||||
RUN pip3 install -U -r requirements.txt
|
||||
COPY install-pip-and-packages.sh .
|
||||
RUN ./install-pip-and-packages.sh
|
||||
|
||||
COPY --from=extension /usr/src/app/dist/openwpm-*.zip automation/Extension/firefox/openwpm.xpi
|
||||
|
||||
|
@ -59,5 +55,5 @@ COPY . .
|
|||
# possible to run everything as root as well.
|
||||
RUN adduser --disabled-password --gecos "OpenWPM" openwpm
|
||||
|
||||
# Alternatively, python3 could be used here
|
||||
# Setting demo.py as the default command
|
||||
CMD python3 demo.py
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
set -e
|
||||
|
||||
# Dependencies for OpenWPM development -- NOT needed to run the platform.
|
||||
pip install --user -U -r requirements-dev.txt
|
||||
pip3 install --user -U -r requirements-dev.txt
|
||||
|
|
|
@ -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 libboost-python-dev libleveldb-dev libjpeg-dev curl wget git bash vim
|
||||
sudo apt-get install -y firefox htop git libxml2-dev libxslt-dev libffi-dev libssl-dev build-essential libboost-python-dev libleveldb-dev libjpeg-dev curl wget git bash vim
|
||||
|
||||
# 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
|
||||
|
|
Загрузка…
Ссылка в новой задаче