From 71ecf272917a414713dfdd9e059f1ad07fd0e44c Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Wed, 8 Jul 2020 00:58:54 -0500
Subject: [PATCH] Update testbed docker image

---
 .travis.yml        | 4 ++--
 Dockerfile         | 5 +++--
 Makefile           | 7 ++++---
 docker-compose.yml | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e340cd2..5683e96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,6 @@ language: minimal
 services:
   - docker
 before_install:
-  - docker pull yadm/testbed:2020-01-20
+  - docker pull yadm/testbed:2020-07-08
 script:
-  - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2020-01-20
+  - docker run -t --rm -v "$PWD:/yadm:ro" yadm/testbed:2020-07-08
diff --git a/Dockerfile b/Dockerfile
index 4544bff..f686108 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,8 +36,9 @@ RUN pip3 install \
       yamllint==1.17.0 \
     ;
 
-RUN curl https://raw.githubusercontent.com/jirutka/esh/v0.3.0/esh > /usr/local/bin/esh; \
-    chmod +x /usr/local/bin/esh
+RUN \
+  curl https://raw.githubusercontent.com/jirutka/esh/v0.3.0/esh > /usr/local/bin/esh && \
+  chmod +x /usr/local/bin/esh
 
 # Create a flag to identify when running inside the yadm testbed
 RUN touch /.yadmtestbed
diff --git a/Makefile b/Makefile
index 60210b8..e7895be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 PYTESTS = $(wildcard test/test_*.py)
+IMAGE = yadm/testbed:2020-07-08
 
 .PHONY: all
 all:
@@ -90,7 +91,7 @@ $(PYTESTS):
 test:
 	@if [ -f /.yadmtestbed ]; then \
 		cd /yadm && \
-		py.test -vv $(testargs); \
+		py.test -v $(testargs); \
 	else \
 		if command -v "docker-compose" &> /dev/null; then \
 			docker-compose run --rm testbed make test testargs="$(testargs)"; \
@@ -112,7 +113,7 @@ testhost: require-docker
 		--hostname testhost \
 		--rm -it \
 		-v "/tmp/testhost:/bin/yadm:ro" \
-		yadm/testbed:2020-01-20 \
+		$(IMAGE) \
 		bash -l
 
 .PHONY: scripthost
@@ -129,7 +130,7 @@ scripthost: require-docker
 		--rm -it \
 		-v "$$PWD/script.gz:/script.gz:rw" \
 		-v "/tmp/testhost:/bin/yadm:ro" \
-		yadm/testbed:2020-01-20 \
+		$(IMAGE) \
 		bash -c "script /tmp/script -q -c 'bash -l'; gzip < /tmp/script > /script.gz"
 	@echo
 	@echo "Script saved to $$PWD/script.gz"
diff --git a/docker-compose.yml b/docker-compose.yml
index 0fad313..60458d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,4 +4,4 @@ services:
   testbed:
     volumes:
       - .:/yadm:ro
-    build: .
+    image: yadm/testbed:2020-07-08