Dockerizing travis tests

Hainish · Hainish · commit 150a40c70fbd · 2016-05-24T15:55:41.000-07:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.git/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,38 +1,12 @@
-# Config copied from
-#  http://www.theautomatedtester.co.uk/blog/2012/using-travis-ci-for-building-and-testing-firefox-addons.html
-language: python
-python:
-  - "2.7"
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - $HOME/virtualenv/python2.7_with_system_site_packages
-addons:
-  apt:
-    packages:
-      - libxml2-dev
-      - libxml2-utils
-      - python-dev
-      - libcurl4-openssl-dev
-      - python-lxml
-      - python-software-properties
-      - chromium-browser
-virtualenv:
-  system_site_packages: true
-install:
-  - pip install -r test/rules/requirements.txt
-  - pip install -r test/chromium/requirements.txt
-  - PYCURL_SSL_LIBRARY=openssl pip install --upgrade --force-reinstall --compile pycurl
-env:
-  - FIREFOX_VERSION=firefox-latest
-  - FIREFOX_VERSION=firefox-esr-latest
-before_script:
-  - sudo apt-get install chromium-chromedriver
-  - wget -O /tmp/firefox.tar.bz2 'https://download.mozilla.org/?os=linux64&lang=en-US&product='$FIREFOX_VERSION
-  - tar xpjf /tmp/firefox.tar.bz2
-  - export FIREFOX=$PWD/firefox/firefox
-script:
-  - ./test.sh
-  - test/travis-ruleset-fetch.sh
 sudo: required
-dist: trusty
+language: generic
+services:
+  - docker
+before_install:
+  - docker build -t app .
+script:
+  - docker run --rm -ti -v $(pwd):/opt -e FIREFOX=/$FIREFOX/firefox/firefox httpse bash test.sh
+  - docker run --rm -ti -v $(pwd):/opt -e FIREFOX=/$FIREFOX/firefox/firefox httpse bash test/travis-ruleset-fetch.sh
+env:
+  - FIREFOX=firefox-latest
+  - FIREFOX=firefox-esr-latest
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,12 @@
+FROM electronicfrontierfoundation/https-everywhere-docker-base 
+MAINTAINER William Budington "bill@eff.org"
+
+WORKDIR /opt
+ADD test/rules/requirements.txt test/rules/requirements.txt
+ADD test/chromium/requirements.txt test/chromium/requirements.txt
+RUN pip install -r test/rules/requirements.txt
+RUN pip install -r test/chromium/requirements.txt
+
+ENV FIREFOX /firefox-latest/firefox/firefox
+
+WORKDIR /opt
