Merge pull request #2730 from owncloud/improve-tooling

improve tooling

.drone.star

@@ -255,7 +255,7 @@ def testPipelines(ctx):
     return pipelines
 
 def testOcisModule(ctx, module):
-    steps = skipIfUnchanged(ctx, "unit-tests") + makeGenerate(module) + [
+    steps = skipIfUnchanged(ctx, "unit-tests") + makeGoGenerate(module) + [
         {
             "name": "golangci-lint",
             "image": OC_CI_GOLANG,
@@ -327,7 +327,8 @@ def buildOcisBinaryForTesting(ctx):
             "arch": "amd64",
         },
         "steps": skipIfUnchanged(ctx, "acceptance-tests") +
-                 makeGenerate("") +
+                 makeNodeGenerate("") +
+                 makeGoGenerate("") +
                  build() +
                  rebuildBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis"),
         "trigger": {
@@ -622,7 +623,7 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1,
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
                     "cp -r tests/acceptance/filesForUpload/* /uploads",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "yarn build",
                     "./tests/acceptance/run.sh",
                 ],
@@ -685,10 +686,10 @@ def accountsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
                     "cp -r tests/acceptance/filesForUpload/* /uploads",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "yarn build",
                     "cd /drone/src/accounts",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "make test-acceptance-webui",
                 ],
                 "volumes": [stepVolumeOC10Tests] +
@@ -749,9 +750,9 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "cp -r /srv/app/web/tests/acceptance/filesForUpload/* /uploads",
                     "cd /srv/app/web",
                     "git checkout $WEB_COMMITID",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "cd /drone/src/settings",
-                    "yarn install --frozen-lockfile",
+                    "yarn install --immutable",
                     "make test-acceptance-webui",
                 ],
                 "volumes": [stepVolumeOC10Tests] +
@@ -875,12 +876,13 @@ def dockerRelease(ctx, arch):
             "arch": arch,
         },
         "steps": skipIfUnchanged(ctx, "build-docker") +
-                 makeGenerate("") + [
+                 makeNodeGenerate("") +
+                 makeGoGenerate("") + [
             {
                 "name": "build",
                 "image": OC_CI_GOLANG,
                 "commands": [
-                    "make -C ocis release-linux-docker",
+                    "make -C ocis release-linux-docker-%s" % (arch),
                 ],
             },
             {
@@ -949,12 +951,13 @@ def dockerEos(ctx):
             "arch": "amd64",
         },
         "steps": skipIfUnchanged(ctx, "build-docker") +
-                 makeGenerate("") + [
+                 makeNodeGenerate("") +
+                 makeGoGenerate("") + [
             {
                 "name": "build",
                 "image": OC_CI_GOLANG,
                 "commands": [
-                    "make -C ocis release-linux-docker",
+                    "make -C ocis release-linux-docker-amd64",
                 ],
             },
             {
@@ -1052,7 +1055,8 @@ def binaryRelease(ctx, name):
             "arch": "amd64",
         },
         "steps": skipIfUnchanged(ctx, "build-binary") +
-                 makeGenerate("") + [
+                 makeNodeGenerate("") +
+                 makeGoGenerate("") + [
             {
                 "name": "build",
                 "image": OC_CI_GOLANG,
@@ -1395,7 +1399,7 @@ def docs(ctx):
         },
     }
 
-def makeGenerate(module):
+def makeNodeGenerate(module):
     if module == "":
         make = "make"
     else:
@@ -1409,6 +1413,14 @@ def makeGenerate(module):
             ],
             "volumes": [stepVolumeGo],
         },
+    ]
+
+def makeGoGenerate(module):
+    if module == "":
+        make = "make"
+    else:
+        make = "make -C %s" % (module)
+    return [
         {
             "name": "generate go",
             "image": OC_CI_GOLANG,

.make/docs.mk

@@ -1,7 +1,12 @@
+
+SKIP_CONFIG_DOCS_GENERATE ?= 0
+CONFIG_DOCS_BASE_PATH ?= ../docs/extensions
+
 .PHONY: config-docs-generate
 config-docs-generate: $(FLAEX)
-	@echo "$(NAME): generating config docs"
-	@$(FLAEX) >| ../docs/extensions/$(NAME)/configuration.md
+	@if [ $(SKIP_CONFIG_DOCS_GENERATE) -ne 1 ]; then \
+		$(FLAEX) >| $(CONFIG_DOCS_BASE_PATH)/$(NAME)/configuration.md \
+	; fi;
 
 .PHONY: grpc-docs-generate
 grpc-docs-generate: buf-generate

.make/l10n.mk

@@ -12,7 +12,7 @@ OUTPUT_DIR = ./l10n
 TEMPLATE_FILE = ./l10n/template.pot
 
 # Name of the generated .po files for each available locale.
-LOCALE_FILES = $(shell find l10n/locale -name '*.po')
+LOCALE_FILES = $(shell find l10n/locale -name '*.po' 2> /dev/null)
 
 .PHONY: l10n-push
 l10n-push:

.make/recursion.mk

@@ -0,0 +1,8 @@
+
+ifeq ($(MAKE_DEPTH),)
+MAKE_DEPTH := 0
+else
+$(eval MAKE_DEPTH := $(shell echo "$$(( $(MAKE_DEPTH) + 1 ))" ) )
+endif
+
+export

.make/release.mk

@@ -7,24 +7,30 @@ release: release-dirs release-linux release-windows release-darwin release-copy
 
 .PHONY: release-dirs
 release-dirs:
-	mkdir -p $(DIST)/binaries $(DIST)/release
-
-.PHONY: release-linux
-release-linux: $(GOX) release-dirs
-	$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'linux' -arch 'amd64 386 arm64 arm' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+	@mkdir -p $(DIST)/binaries $(DIST)/release
 
 # docker specific packaging flags
 DOCKER_LDFLAGS += -X "$(OCIS_REPO)/ocis-pkg/config/defaults.BaseDataPathType=path" -X "$(OCIS_REPO)/ocis-pkg/config/defaults.BaseDataPathValue=/var/lib/ocis"
-release-linux-docker: $(GOX) release-dirs
-	$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' -os 'linux' -arch 'amd64 386 arm64 arm' -output '$(DIST)/binaries/$(EXECUTABLE)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+release-linux-docker-amd64: $(GOX) release-dirs
+	@$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' -os 'linux' -arch 'amd64' -output '$(DIST)/binaries/$(EXECUTABLE)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+
+release-linux-docker-arm: $(GOX) release-dirs
+	@$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' -os 'linux' -arch 'arm' -output '$(DIST)/binaries/$(EXECUTABLE)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+
+release-linux-docker-arm64: $(GOX) release-dirs
+	@$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS) $(DOCKER_LDFLAGS)' -os 'linux' -arch 'arm64' -output '$(DIST)/binaries/$(EXECUTABLE)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+
+.PHONY: release-linux
+release-linux: $(GOX) release-dirs
+	@$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'linux' -arch 'amd64 386 arm64 arm' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
 
 .PHONY: release-windows
 release-windows: $(GOX) release-dirs
-	$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'windows' -arch 'amd64' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+	@$(GOX) -tags 'netgo $(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -os 'windows' -arch 'amd64' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
 
 .PHONY: release-darwin
 release-darwin: $(GOX) release-dirs
-	$(GOX) -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -os 'darwin' -arch 'amd64' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
+	@$(GOX) -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -os 'darwin' -arch 'amd64 arm64' -output '$(DIST)/binaries/$(EXECUTABLE)-$(OUTPUT)-{{.OS}}-{{.Arch}}' ./cmd/$(NAME)
 
 .PHONY: release-copy
 release-copy:

Dockerfile

@@ -1,3 +1,19 @@
+# Please use this Dockerfile only if
+# you want to build an image from source without
+# Yarn and Go installed on your dev machine.
+
+# You can build oCIS using this Dockerfile
+# by running following command:
+# `docker build -t owncloud/ocis:custom .`
+
+# In most other cases you might want to run the
+# following command instead:
+# `make -C ocis dev-docker`
+# It will build a `owncloud/ocis:dev` image for you
+# and use your local Yarn and Go caches and therefore
+# is a lot faster than the below build steps.
+
+
 FROM owncloudci/nodejs:14 as generate
 
 COPY ./ /ocis/
@@ -12,7 +28,6 @@ COPY --from=generate /ocis /ocis
 WORKDIR /ocis/ocis
 RUN make ci-go-generate build
 
-
 FROM alpine:3.13
 
 RUN apk update && \

Makefile

@@ -43,6 +43,8 @@ ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings`
 include .bingo/Variables.mk
 endif
 
+include .make/recursion.mk
+
 .PHONY: help
 help:
 	@echo "Please use 'make <target>' where <target> is one of the following:"
@@ -130,9 +132,10 @@ ci-go-generate:
 
 .PHONY: ci-node-generate
 ci-node-generate:
-	@for mod in $(OCIS_MODULES); do \
+	@if [ $(MAKE_DEPTH) -le 1 ]; then \
+	for mod in $(OCIS_MODULES); do \
         $(MAKE) --no-print-directory -C $$mod ci-node-generate; \
-    done
+    done; fi;
 
 .PHONY: go-mod-tidy
 go-mod-tidy:
@@ -175,31 +178,31 @@ endif
 .PHONY: l10n-push
 l10n-push:
 	@for extension in $(L10N_MODULES); do \
-    	make -C $$extension l10n-push; \
+		$(MAKE) -C $$extension l10n-push; \
 	done
 
 .PHONY: l10n-pull
 l10n-pull:
 	@for extension in $(L10N_MODULES); do \
-    	make -C $$extension l10n-pull; \
+		$(MAKE) -C $$extension l10n-pull; \
 	done
 
 .PHONY: l10n-clean
 l10n-clean:
 	@for extension in $(L10N_MODULES); do \
-		make -C $$extension l10n-clean; \
+		$(MAKE) -C $$extension l10n-clean; \
 	done
 
 .PHONY: l10n-read
 l10n-read:
 	@for extension in $(L10N_MODULES); do \
-    	make -C $$extension l10n-read; \
+		$(MAKE) -C $$extension l10n-read; \
     done
 
 .PHONY: l10n-write
 l10n-write:
 	@for extension in $(L10N_MODULES); do \
-    	make -C $$extension l10n-write; \
+		$(MAKE) -C $$extension l10n-write; \
     done
 
 .PHONY: ci-format

accounts/.gitignore

@@ -0,0 +1,17 @@
+# yarn2 with Zero-Installs: https://yarnpkg.com/features/zero-installs
+#.yarn/*
+#!.yarn/cache
+#!.yarn/patches
+#!.yarn/plugins
+#!.yarn/releases
+#!.yarn/sdks
+#!.yarn/versions
+
+# yarn2 not using Zero-Installs: https://yarnpkg.com/features/zero-installs
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

accounts/.yarnrc.yml

@@ -0,0 +1,6 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.1.0.cjs
+
+enableScripts: false
+enableTelemetry: false

accounts/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := accounts
 
+include ../.make/recursion.mk
+
 .PHONY: test-acceptance-webui
 test-acceptance-webui:
 	./ui/tests/run-acceptance-test.sh $(FEATURE_PATH)
@@ -44,7 +46,7 @@ yarn-build: node_modules
 
 .PHONY: node_modules
 node_modules:
-	yarn install --frozen-lockfile
+	yarn install --immutable
 
 ############ protobuf ############
 PROTO_VERSION := v0

accounts/package.json

@@ -80,5 +80,6 @@
   },
   "peerDependencies": {
     "owncloud-design-system": "^11.0.0"
-  }
+  },
+  "packageManager": "yarn@3.1.0"
 }

docs/Makefile

@@ -19,7 +19,7 @@ docs-init:
 	@cd hugo && git remote add origin https://github.com/owncloud/owncloud.github.io
 	@cd hugo && git fetch --depth=1
 	@cd hugo && git checkout origin/source -f
-	@make -C hugo theme
+	@$(MAKE) -C hugo theme
 
 .PHONY: docs-serve
 docs-serve: docs-init docs-generate docs-copy ## serve docs with hugo

glauth/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := glauth
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

graph-explorer/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := graph-explorer
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
@@ -29,5 +31,5 @@ ci-node-generate: pull-assets
 
 .PHONY: pull-assets
 pull-assets:
-	@rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/
-
+	@git clean -xfd assets
+	@curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/

graph/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := graph
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

idp/.gitignore

@@ -0,0 +1,17 @@
+# yarn2 with Zero-Installs: https://yarnpkg.com/features/zero-installs
+#.yarn/*
+#!.yarn/cache
+#!.yarn/patches
+#!.yarn/plugins
+#!.yarn/releases
+#!.yarn/sdks
+#!.yarn/versions
+
+# yarn2 not using Zero-Installs: https://yarnpkg.com/features/zero-installs
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

idp/.yarnrc.yml

@@ -0,0 +1,6 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.1.0.cjs
+
+enableScripts: false
+enableTelemetry: false

idp/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := idp
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
@@ -57,4 +59,4 @@ yarn-build: node_modules
 
 .PHONY: node_modules
 node_modules:
-	yarn install --frozen-lockfile
+	yarn install --immutable

idp/package.json

@@ -150,5 +150,6 @@
     "webpack-manifest-plugin": "3.1.0",
     "workbox-webpack-plugin": "4.3.1",
     "yarn-deduplicate": "^3.1.0"
-  }
+  },
+  "packageManager": "yarn@3.1.0"
 }

idp/ui/Makefile

@@ -20,11 +20,11 @@ build: vendor | src i18n ; $(info building identifier Webapp ...)	@
 
 .PHONY: src
 src:
-	@$(MAKE) -C src
+	@$(MAKE) --no-print-directory -C src
 
 .PHONY: i18n
 i18n: vendor
-	@$(MAKE) -C i18n
+	@$(MAKE) --no-print-directory -C i18n
 
 .PHONY: lint
 lint: vendor ; $(info running eslint ...)	@
@@ -58,7 +58,7 @@ clean:
 	@rm -rf node_modules
 	@rm -f .yarninstall
 
-	@$(MAKE) -C src clean
+	@$(MAKE) --no-print-directory -C src clean
 
 .PHONY: version
 version:

idp/ui/src/Makefile

@@ -2,7 +2,7 @@ all: images
 
 .PHONY: images
 images:
-	@$(MAKE) -C images
+	@$(MAKE) --no-print-directory -C images
 
 clean:
-	@$(MAKE) -C images clean
+	@$(MAKE) --no-print-directory -C images clean

ocis-pkg/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := ocis-pkg
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
@@ -13,15 +15,13 @@ include ../.make/go.mk
 include ../.make/release.mk
 
 ############ docs generate ############
+SKIP_CONFIG_DOCS_GENERATE = 1
+
 include ../.make/docs.mk
 
 .PHONY: docs-generate
 docs-generate:
 
-.PHONY: config-docs-generate
-config-docs-generate:
-	@echo "ocis-pkg: nothing to do"
-
 ############ generate ############
 include ../.make/generate.mk
 

ocis/Makefile

@@ -1,9 +1,12 @@
 SHELL := bash
 NAME := ocis
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
+GOARCH := $(shell go env GOARCH)
 endif
 
 ############ go tooling ############
@@ -13,15 +16,18 @@ include ../.make/go.mk
 include ../.make/release.mk
 
 ############ docs generate ############
+CONFIG_DOCS_BASE_PATH := ../docs
+
 include ../.make/docs.mk
 
 .PHONY: docs-generate
 docs-generate: config-docs-generate
 
-.PHONY: config-docs-generate
-config-docs-generate: $(FLAEX)
-	@echo "$(NAME): generating config docs"
-	@$(FLAEX) >| ../docs/$(NAME)/configuration.md
+############ dev-docker ############
+.PHONY: dev-docker
+dev-docker:
+	$(MAKE) --no-print-directory release-linux-docker-$(GOARCH)
+	docker build -f docker/Dockerfile.linux.$(GOARCH) -t owncloud/ocis:dev .
 
 ############ generate ############
 include ../.make/generate.mk
@@ -31,8 +37,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 	@go generate ./...
 
 .PHONY: ci-node-generate
-ci-node-generate: # no need to recreate go code, just add assets
-	@make -C ../accounts ci-node-generate
-	@make -C ../graph-explorer ci-node-generate
-	@make -C ../settings ci-node-generate
-	@make -C ../web ci-node-generate
+ci-node-generate: # ocis needs assets of all other modules
+	@if [ $(MAKE_DEPTH) -le 1 ]; then \
+	$(MAKE) --no-print-directory -C .. ci-node-generate \
+	; fi;

ocs/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := ocs
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
@@ -26,5 +28,4 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target
 	@go generate ./...
 
 .PHONY: ci-node-generate
-ci-node-generate: 
-	@make -C ../accounts ci-node-generate
+ci-node-generate:

proxy/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := proxy
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

settings/.gitignore

@@ -0,0 +1,17 @@
+# yarn2 with Zero-Installs: https://yarnpkg.com/features/zero-installs
+#.yarn/*
+#!.yarn/cache
+#!.yarn/patches
+#!.yarn/plugins
+#!.yarn/releases
+#!.yarn/sdks
+#!.yarn/versions
+
+# yarn2 not using Zero-Installs: https://yarnpkg.com/features/zero-installs
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

settings/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := settings
 
+include ../.make/recursion.mk
+
 .PHONY: test-acceptance-webui
 test-acceptance-webui:
 	./ui/tests/run-acceptance-test.sh $(FEATURE_PATH)
@@ -45,7 +47,7 @@ yarn-build: node_modules
 
 .PHONY: node_modules
 node_modules:
-	yarn install --frozen-lockfile
+	yarn install --immutable
 
 ############ protobuf ############
 PROTO_VERSION := v0

storage/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := storage
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

store/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := store
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

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

thumbnails/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := thumbnails
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk

web/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := web
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
@@ -31,4 +33,5 @@ WEB_ASSETS_VERSION = v4.4.0
 
 .PHONY: pull-assets
 pull-assets:
-	@rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/
+	@git clean -xfd assets
+	@curl -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/web.tar.gz | tar xzf - -C assets/

webdav/Makefile

@@ -1,6 +1,8 @@
 SHELL := bash
 NAME := webdav
 
+include ../.make/recursion.mk
+
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk