Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tests/acceptance/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ else
SEARCH_EXTRACTOR_TYPE := basic
endif

# default to decomposedfs
STORAGE_DRIVER ?= decomposed
ifeq ($(STORAGE_DRIVER),posix)
# posix requires a additional driver config
COMPOSE_FILE := $(COMPOSE_FILE):src/posix.yml
endif

# static
DIVIDE_INTO_NUM_PARTS := 10
PARTS = 1 2 3 4 5 6 7 8 9 10
Expand Down Expand Up @@ -296,7 +303,7 @@ start-server: $(OC_WRAPPER) ## build and start server
OC_IMAGE_TAG=dev \
WITH_WRAPPER=$(WITH_WRAPPER) \
TEST_SOURCE=opencloud \
STORAGE_DRIVER=decomposed \
STORAGE_DRIVER=$(STORAGE_DRIVER) \
OC_ASYNC_UPLOADS=true \
SEARCH_EXTRACTOR_TYPE=tika \
OC_ADD_RUN_SERVICES=notifications \
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/docker/src/opencloud.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# mounting 'ocwrapper' binary doesn't work with image 'amd64/alpine:3.17' (busybox based)

ARG OC_IMAGE_TAG
FROM opencloud-eu/opencloud:${OC_IMAGE_TAG} AS opencloud
FROM opencloudeu/opencloud:${OC_IMAGE_TAG} AS opencloud

FROM ubuntu:22.04
COPY --from=opencloud /usr/bin/opencloud /usr/bin/opencloud
Expand Down
8 changes: 8 additions & 0 deletions tests/acceptance/docker/src/posix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
services:
opencloud-server:
environment:
# activate posix storage driver for users
STORAGE_USERS_DRIVER: posix
# posix requires a shared cache store
STORAGE_USERS_ID_CACHE_STORE: "nats-js-kv"