Revert "Cleanup docker and deploy"

This reverts commit fa7d246f88.

Revert "[CI] Skip cleanup"

This reverts commit d05b761f6e.

Revert "Deploy docker images in Travis"

This reverts commit f392038d1d.

.travis.yml

@@ -34,13 +34,10 @@ compiler:
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo mkdir -p /etc/docker && echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json && sudo service docker restart; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install qt5 && brew cask install xquartz && brew upgrade boost && brew install rust; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then ci/build-docker-image.sh docker/ci/Dockerfile nanocurrency/nano-ci; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker pull lukealonso/raiblocks-ci:latest; fi
 
 script:
   - if [ -n "$ONE_TIME_TESTS" ]; then ci/check-commit-format.sh; fi
   - if [ -n "$ONE_TIME_TESTS" ]; then doxygen doxygen.config; fi # TODO also deploy the built HTML
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ci/build-travis.sh "/usr/local/opt/qt5/lib/cmake/Qt5"; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker run -v $TRAVIS_BUILD_DIR:/workspace nanocurrency/nano-ci /bin/bash -c "cd /workspace && ASAN=${ASAN} TSAN=${TSAN} ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"; fi
-
-after_script:
-  - if [ -n "$ONE_TIME_TESTS" ] && [ -n "$DOCKER_PASSWORD" ] && [ "$TRAVIS_BRANCH" = "master" ]; then ci/deploy-docker.sh; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then docker run -v $TRAVIS_BUILD_DIR:/workspace lukealonso/raiblocks-ci:latest /bin/bash -c "cd /workspace && ASAN=${ASAN} TSAN=${TSAN} ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"; fi

ci/build-docker-image.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -eu
-
-docker pull "$2" || true
-echo "Building $2"
-docker build -f "$1" -t "$2" --cache-from "$2" .

ci/build-travis.sh

@@ -48,6 +48,12 @@ else
     TRUE_CMD=true
 fi
 
+if ! cargo --version &>/dev/null; then
+    # We'll update the docker image once this PR gets merged.
+    # If you're reading this comment on master, contact @PlasmaPower
+    apt-get update && apt-get install -yq cargo
+fi
+
 pushd load-tester
 cargo build --release
 popd

ci/deploy-docker.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-set -eu
-
-docker login -u nanocurrency -p "$DOCKER_PASSWORD"
-
-# We push this just so it can be a cache next time
-docker push nanocurrency/nano-ci
-
-# We don't need to build this unless we're deploying it
-ci/build-docker-image.sh docker/node/Dockerfile nanocurrency/nano
-docker push nanocurrency/nano

docker/ci/Dockerfile

@@ -1,9 +1,9 @@
 FROM ubuntu:16.04
 
 ENV BOOST_BASENAME=boost_1_66_0 \
-    BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
+    BOOST_URL=http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
 
-RUN apt-get update -qq && apt-get install -yqq \
+RUN apt-get update && apt-get install -yq \
     build-essential \
     cmake \
     g++ \
@@ -11,11 +11,11 @@ RUN apt-get update -qq && apt-get install -yqq \
 
 WORKDIR "/tmp"
 
-RUN wget -qO ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
-    tar xzf ${BOOST_BASENAME}.tar.gz && \
+RUN wget -O ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
+    tar xzvf ${BOOST_BASENAME}.tar.gz && \
     cd ${BOOST_BASENAME} && \
     ./bootstrap.sh && \
-    ./b2 -d0 link=static install && \
+    ./b2 link=static install && \
     rm -rf ${BOOST_BASENAME} && \
     rm -f ${BOOST_BASENAME}.tar.gz && \
     cd ..

docker/node/Dockerfile

@@ -4,16 +4,16 @@ ENV BOOST_BASENAME=boost_1_66_0 \
     BOOST_ROOT=/tmp/boost_install  \
     BOOST_URL=https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
 
-RUN apt-get update -qq && apt-get install -yqq \
+RUN apt-get update && apt-get install -yq \
     build-essential \
     cmake \
     g++ \
     wget && \
-    wget -qO ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
-    tar xzf ${BOOST_BASENAME}.tar.gz && \
+    wget -O ${BOOST_BASENAME}.tar.gz ${BOOST_URL} && \
+    tar xzvf ${BOOST_BASENAME}.tar.gz && \
     cd ${BOOST_BASENAME} && \
     ./bootstrap.sh && \
-    ./b2 -d0 --prefix=${BOOST_ROOT} link=static install && \
+    ./b2 --prefix=${BOOST_ROOT} link=static install && \
     rm -rf ${BOOST_BASENAME} && \
     rm -f ${BOOST_BASENAME}.tar.gz && \
     cd .. && \