Use docker image from the dockerfiles repo.

We no longer try to rebuild the image here. Perhaps someday we can build
it in the dockerfiles travis build, or on a separate machine. For now,
we push it manually.

.travis.yml

@@ -8,7 +8,7 @@ matrix:
     - env: JOB=hstox ENV=android ARCH=arm
       services:
         - docker
-    - env: JOB=hstox ENV=android ARCH=x86
+    - env: JOB=hstox ENV=android ARCH=i686
       services:
         - docker
     - env: JOB=hstox ENV=osx
@@ -29,10 +29,9 @@ cache:
     - $HOME/.cabal
     - $HOME/.ghc
 
-install:       .travis/phase $JOB $ENV install
-script:        .travis/phase $JOB $ENV script
-after_script:  .travis/phase $JOB $ENV after_script
-after_success: .travis/phase $JOB $ENV after_success
+install:      .travis/phase $JOB $ENV install
+script:       .travis/phase $JOB $ENV script
+after_script: .travis/phase $JOB $ENV after_script
 
 notifications:
   irc: "chat.freenode.net#toktok-status"

.travis/android-install

@@ -1,4 +1,5 @@
 #!/bin/sh
 
 docker pull $DOCKER_IMAGE
-make -C tools/docker build-$ARCH
+docker run --rm $DOCKER_IMAGE cat /root/dockrun > dockrun
+chmod +x dockrun

.travis/android-script

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-tools/docker/dockrun target-cabal configure -flibrary-only
-tools/docker/dockrun target-cabal build
+./dockrun target-cabal configure -flibrary-only
+./dockrun target-cabal build

.travis/env-android.sh

@@ -2,4 +2,4 @@
 
 NPROC=`nproc`
 
-export DOCKER_IMAGE=iphydf/haskell-hstox:8.0.1-$ARCH
+export DOCKER_IMAGE=toktoknet/ghc-android-hstox:latest.$ARCH

Makefile

@@ -36,7 +36,6 @@ TEST_TOXCORE	= dist/build/test-toxcore/test-toxcore
 
 
 all: check $(DOCS)
-	$(MAKE) -C tools/docker scripts
 
 fuzz: .build.stamp
 	@echo "Cleaning up previous results"