From 03f9ec9f43d1393c29421d57715a0ce5cd6b0b91 Mon Sep 17 00:00:00 2001
From: ex0dus-0x <ex0dus@codemuch.tech>
Date: Fri, 26 Jul 2019 10:02:08 -0400
Subject: [PATCH] Fix Docker deploy on CI

---
 .travis.yml       |  2 +-
 docker/Dockerfile | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03e9604..dae00cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,5 +44,5 @@ script:
 #- if [ $TASK = STREAMINGANDFORMATTING ]; then nosetests3 tests/test_streamingandformatting.py ; fi
 - if [ $TASK = TAKEOVER ]; then nosetests3 tests/test_takeover.py ; fi
 after_success:
-- bash push/run.sh
+- travis_wait bash push/run.sh
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 68a5085..4fd171f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,20 +31,18 @@ RUN apt-get update \
     && apt-get -y build-dep qemu \
     && apt-get install -y libtool \
     libtool-bin wget automake autoconf \
-    bison gdb git \
+    bison gdb git apt-transport-https \
     && wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb \
     && dpkg -i packages-microsoft-prod.deb \
-    && apt-get install -y apt-transport-https \
     && apt-get update \
     && apt-get install -y dotnet-sdk-2.2
 
 # Install Angora dependencies
 RUN apt-get install -y rustc \
-    && apt-get install -y cargo
+    cargo libstdc++-7-dev
 
 # Install DeepState/AFL/libFuzzer dependencies
-RUN apt-get update \
-    && apt-get install -y build-essential \
+RUN apt-get install -y build-essential \
     && apt-get install -y clang \
     gcc-multilib g++-multilib cmake \
     python3-setuptools libffi-dev z3 python3-pip \
@@ -91,7 +89,7 @@ RUN cd deepstate \
     && rm -rf CMakeFiles CMakeCache.txt \
     && USE_TRACK=1 CXX=$ANGORA/bin/angora-clang++ CC=$ANGORA/bin/angora-clang cmake -DDEEPSTATE_ANGORA=ON ../ \
     && export USE_TRACK=1 && sudo -E sh -c 'make -i install' \
-	&& make clean \
+    && make clean \
     && rm -rf CMakeFiles CMakeCache.txt \
     && CXX=$ANGORA/bin/angora-clang++ CC=$ANGORA/bin/angora-clang cmake -DDEEPSTATE_ANGORA=ON ../ \
     && export USE_FAST=1 && sudo -E sh -c 'make install' \