From 6cfb8415d494fbf18942bf6ec4518ff662375dfe Mon Sep 17 00:00:00 2001
From: fivepiece <fivepiece@users.noreply.github.com>
Date: Mon, 23 Jul 2018 11:01:35 +0300
Subject: [PATCH] cache joinmarket deps on docker

---
 test/Dockerfiles/bionic.Dockerfile   |  4 ++--
 test/Dockerfiles/build_docker.sh     | 17 ++++++++++++-----
 test/Dockerfiles/centos7.Dockerfile  |  4 ++--
 test/Dockerfiles/fedora27.Dockerfile |  4 ++--
 test/Dockerfiles/stretch.Dockerfile  |  4 ++--
 test/Dockerfiles/xenial.Dockerfile   |  4 ++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/test/Dockerfiles/bionic.Dockerfile b/test/Dockerfiles/bionic.Dockerfile
index 4a8c0e0..c4ee488 100755
--- a/test/Dockerfiles/bionic.Dockerfile
+++ b/test/Dockerfiles/bionic.Dockerfile
@@ -26,8 +26,8 @@ USER chaum
 WORKDIR /home/chaum
 RUN ls -la .
 RUN ls -la ${repo_name}
-RUN ls -la ${repo_name}/deps
-RUN tar xaf ./${repo_name}/deps/${core_dist} -C /home/chaum
+RUN ls -la ${repo_name}/deps/cache
+RUN tar xaf ./${repo_name}/deps/cache/${core_dist} -C /home/chaum
 ENV PATH "/home/chaum/bitcoin-${core_version}/bin:${PATH}"
 RUN bitcoind --version | head -1
 
diff --git a/test/Dockerfiles/build_docker.sh b/test/Dockerfiles/build_docker.sh
index 7a9dc1d..00ff5e0 100755
--- a/test/Dockerfiles/build_docker.sh
+++ b/test/Dockerfiles/build_docker.sh
@@ -18,16 +18,23 @@ build_docker ()
     core_version='0.16.1'
     core_dist="bitcoin-${core_version}-x86_64-linux-gnu.tar.gz"
     core_url="https://bitcoin.org/bin/bitcoin-core-${core_version}/${core_dist}"
+    libffi_lib_tar='v3.2.1.tar.gz'
+    libffi_url="https://github.com/libffi/libffi/archive/${libffi_lib_tar}"
+    sodium_lib_tar='libsodium-1.0.13.tar.gz'
+    sodium_url="https://download.libsodium.org/libsodium/releases/${sodium_lib_tar}"
+    declare -A deps=( [${core_dist}]="${core_url}" [${libffi_lib_tar}]="${libffi_url}" [${sodium_lib_tar}]="${sodium_url}" )
     jm_root="${TRAVIS_BUILD_DIR}"
     owner_name="${TRAVIS_REPO_SLUG%\/*}"
     repo_name="${TRAVIS_REPO_SLUG#*\/}"
 
-    if [[ ! -f "${HOME}/downloads/${core_dist}" ]]; then
-        wget "${core_url}" -O "$HOME/downloads/${core_dist}"
-    fi
+    for dep in ${!deps[@]}; do
+        if [[ ! -r "${HOME}/downloads/${dep}" ]]; then
+            curl --retry 5 -L "${deps[${dep}]}" -o "$HOME/downloads/${dep}"
+        fi
+    done
 
-    mkdir -p "${jm_root}/deps"
-    cp "${HOME}/downloads/${core_dist}" "${jm_root}/deps/"
+    mkdir -p "${jm_root}/deps/cache"
+    find "$HOME/downloads" -type f -exec cp -v {} "${jm_root}/deps/cache/" \;
     cd "${jm_root}/../"
 
     docker build \
diff --git a/test/Dockerfiles/centos7.Dockerfile b/test/Dockerfiles/centos7.Dockerfile
index 5b9a636..3cf0e2e 100755
--- a/test/Dockerfiles/centos7.Dockerfile
+++ b/test/Dockerfiles/centos7.Dockerfile
@@ -22,8 +22,8 @@ USER chaum
 WORKDIR /home/chaum
 RUN ls -la .
 RUN ls -la ${repo_name}
-RUN ls -la ${repo_name}/deps
-RUN tar xaf ./${repo_name}/deps/${core_dist} -C /home/chaum
+RUN ls -la ${repo_name}/deps/cache
+RUN tar xaf ./${repo_name}/deps/cache/${core_dist} -C /home/chaum
 ENV PATH "/home/chaum/bitcoin-${core_version}/bin:${PATH}"
 RUN bitcoind --version | head -1
 
diff --git a/test/Dockerfiles/fedora27.Dockerfile b/test/Dockerfiles/fedora27.Dockerfile
index 1b36887..de890b7 100755
--- a/test/Dockerfiles/fedora27.Dockerfile
+++ b/test/Dockerfiles/fedora27.Dockerfile
@@ -25,8 +25,8 @@ USER chaum
 WORKDIR /home/chaum
 RUN ls -la .
 RUN ls -la ${repo_name}
-RUN ls -la ${repo_name}/deps
-RUN tar xaf ./${repo_name}/deps/${core_dist} -C /home/chaum
+RUN ls -la ${repo_name}/deps/cache
+RUN tar xaf ./${repo_name}/deps/cache/${core_dist} -C /home/chaum
 ENV PATH "/home/chaum/bitcoin-${core_version}/bin:${PATH}"
 RUN bitcoind --version | head -1
 
diff --git a/test/Dockerfiles/stretch.Dockerfile b/test/Dockerfiles/stretch.Dockerfile
index c6cc8c1..ef37f79 100755
--- a/test/Dockerfiles/stretch.Dockerfile
+++ b/test/Dockerfiles/stretch.Dockerfile
@@ -26,8 +26,8 @@ USER chaum
 WORKDIR /home/chaum
 RUN ls -la .
 RUN ls -la ${repo_name}
-RUN ls -la ${repo_name}/deps
-RUN tar xaf ./${repo_name}/deps/${core_dist} -C /home/chaum
+RUN ls -la ${repo_name}/deps/cache
+RUN tar xaf ./${repo_name}/deps/cache/${core_dist} -C /home/chaum
 ENV PATH "/home/chaum/bitcoin-${core_version}/bin:${PATH}"
 RUN bitcoind --version | head -1
 
diff --git a/test/Dockerfiles/xenial.Dockerfile b/test/Dockerfiles/xenial.Dockerfile
index 8c3ab3d..5d03ebc 100755
--- a/test/Dockerfiles/xenial.Dockerfile
+++ b/test/Dockerfiles/xenial.Dockerfile
@@ -26,8 +26,8 @@ USER chaum
 WORKDIR /home/chaum
 RUN ls -la .
 RUN ls -la ${repo_name}
-RUN ls -la ${repo_name}/deps
-RUN tar xaf ./${repo_name}/deps/${core_dist} -C /home/chaum
+RUN ls -la ${repo_name}/deps/cache
+RUN tar xaf ./${repo_name}/deps/cache/${core_dist} -C /home/chaum
 ENV PATH "/home/chaum/bitcoin-${core_version}/bin:${PATH}"
 RUN bitcoind --version | head -1