Fix test order and use default image if env is not set

Author: solidnerd

Makefile

@@ -32,8 +32,6 @@ push-release:
 
 e2e: 
 	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d
-	@echo "Wait 30 seconds to spinn up everything"
-	@sleep 30
 	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut
 	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v
 

docker-compose.test.yml

@@ -3,6 +3,8 @@ services:
   sut:
     image: appropriate/curl
     command: ["--retry", "15","--retry-delay","5","--retry-connrefused","http://bookstack/login"]
+    depends_on:
+    - bookstack
   mysql:
     image: mysql:5.7.21
     environment:
@@ -14,8 +16,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    container_name: bookstack
-    image: ${BOOKSTACK_IMAGE}
+    image: ${BOOKSTACK_IMAGE:-solidnerd/bookstack}
     depends_on:
     - mysql
     environment: