Merge pull request #143 from OctoPrint/repo-cleanup

Repo cleanup

Author: LongLiveCHIEF

.gitignore

@@ -1,11 +1,11 @@
 build:
-	docker-compose -f compose.test.yml build
+	docker-compose -f test/compose.test.yml build
 
 down:
-	docker-compose -f compose.test.yml down
+	docker-compose -f test/compose.test.yml down
 
 up:
-	docker-compose -f compose.test.yml up
+	docker-compose -f test/compose.test.yml up
 
 clean:
-	docker-compose -f compose.test.yml down --rmi local -v
+	docker-compose -f test/compose.test.yml down --rmi local -v

Makefile

@@ -3,7 +3,7 @@ version: '2.4'
 services:
   octoprint:
     build: 
-      context: ./
+      context: ../
       args:
         octoprint_ref: 1.5.1
     image: octoprint/octoprint:test