From f153b82244493c60a31ae0745d9c3415f2fa3914 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 26 Nov 2018 01:10:55 +0900
Subject: [PATCH] Fix qemu-arm-static location

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21b6041..df399cf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,10 +47,6 @@ jobs:
       - checkout  
       - run:
           command: |
-            sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
-            sudo apt update
-            sudo apt install -y qemu qemu-user-static qemu-user binfmt-support
-            sudo cp /usr/bin/qemu-arm-static qemu-arm-static
             # If CIRCLE_TAG is "BitcoinCore/0.17.0"
             # Then:
             # $SEPARATOR=12
@@ -67,6 +63,10 @@ jobs:
             DOCKERHUB_DOCKEFILE="$NODE_NAME/$NODE_VERSION/linuxarm32v7.Dockerfile"
             #
             # Make sure the builder is copy the arm emulator
+            sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
+            sudo apt update
+            sudo apt install -y qemu qemu-user-static qemu-user binfmt-support
+            sudo cp /usr/bin/qemu-arm-static "$(dirname "$DOCKERHUB_DOCKEFILE")/qemu-arm-static"
             sed -i -e 's/#EnableQEMU //g' "$DOCKERHUB_DOCKEFILE"
             #
             echo "Pushing $DOCKERHUB_DOCKEFILE to dockerhub repository $DOCKERHUB_DESTINATION"