Rooba
/
pyodide
mirror of https://github.com/pyodide/pyodide.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address comments in the PR

This commit is contained in:
Michael Droettboom 2018-10-09 10:22:25 -04:00
parent 4562841b61
commit 7ae58324bc
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -3,7 +3,7 @@ version: 2
defaults: &defaults
working_directory: ~/repo
docker:
- image: registry.hub.docker.com/mdboom/pyodide:0.1.1
- image: iodide/pyodide:0.2.0
jobs:
build:

40
Dockerfile
View File

@ -2,31 +2,31 @@ FROM circleci/python:3.7.0-stretch-browsers
# We need at least g++-8, but stretch comes with g++-6
# Set up the Debian testing repo, and then install g++ from there...
RUN sudo bash -c "echo \"deb http://ftp.us.debian.org/debian testing main contrib non-free\" >> /etc/apt/sources.list"
RUN sudo apt-get update
RUN sudo apt-get install node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache
RUN sudo apt-get install -t testing g++-8
RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6
RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 80 --slave /usr/bin/g++ g++ /usr/bin/g++-8
RUN sudo update-alternatives --set gcc /usr/bin/gcc-8
RUN sudo apt-get clean
RUN sudo ln -s /usr/bin/clang-format-6.0 /usr/bin/clang-format
RUN sudo bash -c "echo \"deb http://ftp.us.debian.org/debian testing main contrib non-free\" >> /etc/apt/sources.list" \
&& sudo apt-get update \
&& sudo apt-get install node-less cmake build-essential clang-format-6.0 uglifyjs chromium ccache \
&& sudo apt-get install -t testing g++-8 \
&& sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6 \
&& sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 80 --slave /usr/bin/g++ g++ /usr/bin/g++-8 \
&& sudo update-alternatives --set gcc /usr/bin/gcc-8 \
&& sudo apt-get clean \
&& sudo apt-get autoremove \
&& sudo ln -s /usr/bin/clang-format-6.0 /usr/bin/clang-format \
&& sudo bash -c "echo 'application/wasm wasm' >> /etc/mime.types"
RUN sudo pip install pytest pytest-xdist pytest-instafail selenium PyYAML flake8
# Get recent version of Firefox and geckodriver
RUN sudo wget --quiet -O firefox.tar.bz2 https://download.mozilla.org/\?product\=firefox-latest-ssl\&os\=linux64\&lang\=en-US
RUN sudo tar jxf firefox.tar.bz2
RUN sudo rm -f /usr/local/bin/firefox
RUN sudo ln -s $PWD/firefox/firefox /usr/local/bin/firefox
RUN sudo wget --quiet https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz
RUN sudo tar zxf geckodriver-v0.21.0-linux64.tar.gz -C /usr/local/bin
RUN sudo wget --quiet -O firefox.tar.bz2 https://download.mozilla.org/\?product\=firefox-latest-ssl\&os\=linux64\&lang\=en-US \
&& sudo tar jxf firefox.tar.bz2 \
&& sudo rm -f /usr/local/bin/firefox \
&& sudo ln -s $PWD/firefox/firefox /usr/local/bin/firefox \
&& sudo wget --quiet https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz \
&& sudo tar zxf geckodriver-v0.21.0-linux64.tar.gz -C /usr/local/bin
# Get recent version of chromedriver
RUN sudo wget --quiet https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip
RUN sudo unzip chromedriver_linux64.zip
RUN sudo mv $PWD/chromedriver /usr/local/bin
RUN sudo bash -c "echo 'application/wasm wasm' >> /etc/mime.types"
RUN sudo wget --quiet https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip \
&& sudo unzip chromedriver_linux64.zip \
&& sudo mv $PWD/chromedriver /usr/local/bin
WORKDIR /src

2
run_docker
View File

@ -1,2 +1,2 @@
#!/bin/sh
docker run -v $PWD:/src --user root -e NB_UID=$UID -e NB_GID+$GID -it registry.hub.docker.com/mdboom/pyodide:0.1.1 /bin/bash
docker run --rm -v $PWD:/src --user root -e NB_UID=$UID -e NB_GID+$GID -it iodide/pyodide:0.2.0 /bin/bash