From 375a607356e303a5c12a591d2b33f0f05dcf5023 Mon Sep 17 00:00:00 2001
From: Chris Cinelli <unknown>
Date: Thu, 24 Oct 2019 20:27:58 -0700
Subject: [PATCH] Add test for docker in travis

---
 .travis.yml |  9 +++++----
 Makefile    | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4eb33ca..8c61b8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,15 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gcc-7
+      - gcc-8
       - cppcheck
+services:
+  - docker
 before_install:
     - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
     - sudo apt-get update -q
-    - sudo apt-get install -y gcc-arm-embedded
-    - sudo apt-get install -y python3-venv
+    - sudo apt-get install -y gcc-arm-embedded python3-venv
 script:
-  - export CC=gcc-7
+  - export CC=gcc-8
   - pyenv shell 3.6.7
   - make travis
diff --git a/Makefile b/Makefile
index 72482c5..cc21575 100644
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,18 @@ clean:
 full-clean: clean
 	rm -rf venv
 
+test-docker:
+	rm -rf builds/*
+	$(MAKE) uncached-docker-build-toolchain
+	# Check if there are 4 docker images/tas named "solokeys/solo-firmware-toolchain"
+	NTAGS=$$(docker images | grep -c "solokeys/solo-firmware-toolchain") && [ $$NTAGS -eq 4 ]
+	$(MAKE) docker-build-all
+	# Check that the builds were created
+	NFILES=$$(ls -l builds | grep -c "bootloader") && [ $$NFILES -eq 4 ]
+	NFILES=$$(ls -l builds | grep -c "bundle") && [ $$NFILES -eq 6 ]
+	NFILES=$$(ls -l builds | grep -c "firmware") && [ $$NFILES -eq 10 ]
+
 travis:
 	$(MAKE) test VENV=". ../../venv/bin/activate;"
-	$(MAKE) black
+	$(MAKE) test-docker
+	$(MAKE) black
\ No newline at end of file