make docker based acceptance tests use the dev image make target

tests/acceptance/docker/Makefile

@@ -18,12 +18,13 @@ COMPOSE_FILE ?= src/redis.yml:src/ocis-base.yml:src/acceptance.yml
 ## user input
 BEHAT_FEATURE ?=
 
+
 ifdef OCIS_IMAGE_TAG
-	COMPOSE_FILE := $(COMPOSE_FILE):src/ocis-image.yml
+	BUILD_DEV_IMAGE := 0
 else
-	COMPOSE_FILE := $(COMPOSE_FILE):src/ocis-build.yml
+	BUILD_DEV_IMAGE := 1
 endif
-OCIS_IMAGE_TAG ?= latest
+OCIS_IMAGE_TAG ?= dev
 
 # static
 DIVIDE_INTO_NUM_PARTS := 10
@@ -191,7 +192,7 @@ $(targets):
 	$(MAKE) --no-print-directory testSuite
 
 .PHONY: testSuite
-testSuite: clean-docker-container
+testSuite: build-dev-image clean-docker-container
 	@if [ -n "${START_CEPH}" ]; then \
 		COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 		COMPOSE_FILE=src/ceph.yml \
@@ -212,7 +213,18 @@ testSuite: clean-docker-container
 show-test-logs: ## show logs of test
 	@COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
 	COMPOSE_FILE=$(COMPOSE_FILE) \
-	docker logs -f ocis-acceptance-tests_acceptance-tests_1 | less
+	docker-compose logs --no-log-prefix -f acceptance-tests | less
+
+.PHONY: build-dev-image
+build-dev-image:
+	@rm -rf ../../../vendor
+	@if [ $(BUILD_DEV_IMAGE) -eq 1 ]; then \
+		$(MAKE) --no-print-directory -C ../../../ocis dev-docker \
+	; fi;
+
+.PHONY: clean-dev-docker-image
+clean-dev-docker-image: ## clean docker image built during acceptance tests
+	@docker image rm owncloud/ocis:dev || true
 
 .PHONY: clean-docker-container
 clean-docker-container: ## clean docker containers created during acceptance tests
@@ -242,4 +254,4 @@ clean-docker-volumes: ## clean docker volumes created during acceptance tests
 	@$(MAKE) --no-print-directory -C ../. clean-tests
 
 .PHONY: clean
-clean: clean-docker-container clean-docker-volumes clean-files ## clean all
+clean: clean-docker-container clean-docker-volumes clean-dev-docker-image clean-files ## clean all

tests/acceptance/docker/src/acceptance.yml

@@ -23,6 +23,9 @@ services:
       - ./run-tests.sh:/test/run-tests.sh
       - oCISownCloud10testsuite:/srv
       - ../../../../:/drone/src
+      - ../../../../vendor-bin/behat/composer.json:/tmp/vendor-bin/behat/composer.json
+      - oCISownCloud10testsuite-vendor:/drone/src/vendor
 
 volumes:
   oCISownCloud10testsuite:
+  oCISownCloud10testsuite-vendor:

tests/acceptance/docker/src/ocis-base.yml

@@ -1,5 +1,7 @@
 services:
   ocis-server:
+    image: owncloud/ocis:$OCIS_IMAGE_TAG
+    user: root
     environment:
       OCIS_URL: "https://ocis-server:9200"
       STORAGE_HOME_DRIVER: $STORAGE_DRIVER

tests/acceptance/docker/src/ocis-build.yml

@@ -1,5 +0,0 @@
-services:
-  ocis-server:
-    build:
-      context: ./../../../../.
-      dockerfile: Dockerfile

tests/acceptance/docker/src/ocis-image.yml

@@ -1,4 +0,0 @@
-services:
-  ocis-server:
-    image: owncloud/ocis:$OCIS_IMAGE_TAG
-    user: root

tests/acceptance/docker/src/run-tests.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+#mkdir -p /drone/src/vendor-bin/behat
+#cp /tmp/vendor-bin/behat/composer.json /drone/src/vendor-bin/behat/composer.json
+
 git config --global advice.detachedHead false
 
 ## GET DEPENDENCIES