Add configuration for antivirus in docker compose for tests
This commit is contained in:
@@ -186,11 +186,19 @@ testSuite: $(OCIS_WRAPPER) build-dev-image clean-docker-container
|
||||
COMPOSE_FILE=src/email.yml \
|
||||
docker-compose run start_email; \
|
||||
fi; \
|
||||
if [ "${START_ANTIVIRUS}" == "true" ]; then \
|
||||
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
|
||||
COMPOSE_FILE=src/antivirus.yml \
|
||||
docker-compose run start_antivirus; \
|
||||
fi; \
|
||||
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \
|
||||
COMPOSE_FILE=$(COMPOSE_FILE) \
|
||||
STORAGE_DRIVER=$(STORAGE_DRIVER) \
|
||||
TEST_SOURCE=$(TEST_SOURCE) \
|
||||
WITH_WRAPPER=$(WITH_WRAPPER) \
|
||||
OCIS_ASYNC_UPLOADS=$(OCIS_ASYNC_UPLOADS) \
|
||||
OCIS_ADD_RUN_SERVICES=$(OCIS_ADD_RUN_SERVICES) \
|
||||
POSTPROCESSING_STEPS=$(POSTPROCESSING_STEPS) \
|
||||
OCIS_IMAGE_TAG=$(OCIS_IMAGE_TAG) \
|
||||
BEHAT_SUITE=$(BEHAT_SUITE) \
|
||||
BEHAT_FEATURE=$(BEHAT_FEATURE) \
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
services:
|
||||
start_antivirus:
|
||||
image: dadarek/wait-for-dependencies
|
||||
depends_on:
|
||||
- clamav
|
||||
command: clamav:3310
|
||||
clamav:
|
||||
image: owncloudci/clamavd
|
||||
volumes:
|
||||
- clamavSocket:/var/run/clamav/
|
||||
|
||||
volumes:
|
||||
clamavSocket:
|
||||
|
||||
@@ -22,6 +22,9 @@ services:
|
||||
IDM_CREATE_DEMO_USERS: "true"
|
||||
IDM_ADMIN_PASSWORD: "admin"
|
||||
FRONTEND_SEARCH_MIN_LENGTH: "2"
|
||||
OCIS_ASYNC_UPLOADS: $OCIS_ASYNC_UPLOADS
|
||||
OCIS_ADD_RUN_SERVICES: $OCIS_ADD_RUN_SERVICES
|
||||
|
||||
# s3ng specific settings
|
||||
STORAGE_USERS_S3NG_ENDPOINT: http://ceph:8080
|
||||
STORAGE_USERS_S3NG_REGION: default
|
||||
@@ -32,6 +35,19 @@ services:
|
||||
NOTIFICATIONS_SMTP_HOST: email
|
||||
NOTIFICATIONS_SMTP_PORT: 2500
|
||||
NOTIFICATIONS_SMTP_INSECURE: "true"
|
||||
|
||||
# antivirus
|
||||
ANTIVIRUS_SCANNER_TYPE: "clamav"
|
||||
ANTIVIRUS_CLAMAV_SOCKET: "/var/run/clamav/clamd.sock"
|
||||
|
||||
# postprocessing step
|
||||
POSTPROCESSING_STEPS: $POSTPROCESSING_STEPS
|
||||
volumes:
|
||||
- ../../../config:/drone/src/tests/config
|
||||
- ../../../ociswrapper/bin/ociswrapper:/usr/bin/ociswrapper
|
||||
- clamavSocket:/var/run/clamav/
|
||||
|
||||
volumes:
|
||||
clamavSocket:
|
||||
external:
|
||||
name: ocis-acceptance-tests_clamavSocket
|
||||
|
||||
Reference in New Issue
Block a user