From 54b60cf9b001e7ea6621dfe9f2b82ef45b294a3a Mon Sep 17 00:00:00 2001
From: Christian Franke <chris@opensourcerouting.org>
Date: Sat, 1 Dec 2018 19:40:38 +0100
Subject: [PATCH] Revert "tests/topotests: Change docker build context"

This reverts commit 659782730bffea2d21e2fa22550db3166017061e.

Apparently, the build context is inferred from the Dockerfile path.
Yay for sensible documentation. :/

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---
 tests/topotests/Dockerfile      | 2 +-
 tests/topotests/docker/build.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/topotests/Dockerfile b/tests/topotests/Dockerfile
index 3613e23a6..72a876ed8 100644
--- a/tests/topotests/Dockerfile
+++ b/tests/topotests/Dockerfile
@@ -70,7 +70,7 @@ RUN echo "" >> /etc/security/limits.conf; \
     echo "root hard core unlimited" >> /etc/security/limits.conf
 
 # Copy run scripts to facilitate users wanting to run the tests
-COPY tests/topotests/docker/inner /opt/topotests
+COPY docker/inner /opt/topotests
 
 WORKDIR /root/topotests
 ENV PATH "$PATH:/opt/topotests"
diff --git a/tests/topotests/docker/build.sh b/tests/topotests/docker/build.sh
index 3bb6dbaad..344fb2ffc 100755
--- a/tests/topotests/docker/build.sh
+++ b/tests/topotests/docker/build.sh
@@ -22,10 +22,9 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cd "$(dirname "$0")"/../../..
+cd "$(dirname "$0")"/..
 
 exec docker build --pull \
 		  --compress \
 		  -t frrouting/frr:topotests-latest \
-		  -f tests/topotests/Dockerfile \
 		  .
-- 
2.39.2