Merge branch 'dev' into refactor-whitelist-type
This commit is contained in:
commit
84aa5f6a0d
4 changed files with 20 additions and 19 deletions
2
.env
2
.env
|
@ -17,7 +17,7 @@ _APP_DB_PORT=3306
|
||||||
_APP_DB_SCHEMA=appwrite
|
_APP_DB_SCHEMA=appwrite
|
||||||
_APP_DB_USER=user
|
_APP_DB_USER=user
|
||||||
_APP_DB_PASS=password
|
_APP_DB_PASS=password
|
||||||
_APP_STORAGE_ANTIVIRUS=enabled
|
_APP_STORAGE_ANTIVIRUS=disabled
|
||||||
_APP_STORAGE_ANTIVIRUS_HOST=clamav
|
_APP_STORAGE_ANTIVIRUS_HOST=clamav
|
||||||
_APP_STORAGE_ANTIVIRUS_PORT=3310
|
_APP_STORAGE_ANTIVIRUS_PORT=3310
|
||||||
_APP_INFLUXDB_HOST=influxdb
|
_APP_INFLUXDB_HOST=influxdb
|
||||||
|
|
|
@ -71,7 +71,7 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- mariadb
|
- mariadb
|
||||||
- redis
|
- redis
|
||||||
- clamav
|
# - clamav
|
||||||
- influxdb
|
- influxdb
|
||||||
environment:
|
environment:
|
||||||
- _APP_ENV
|
- _APP_ENV
|
||||||
|
@ -414,13 +414,13 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- appwrite-redis:/data:rw
|
- appwrite-redis:/data:rw
|
||||||
|
|
||||||
clamav:
|
# clamav:
|
||||||
image: appwrite/clamav:1.2.0
|
# image: appwrite/clamav:1.2.0
|
||||||
container_name: appwrite-clamav
|
# container_name: appwrite-clamav
|
||||||
networks:
|
# networks:
|
||||||
- appwrite
|
# - appwrite
|
||||||
volumes:
|
# volumes:
|
||||||
- appwrite-uploads:/storage/uploads
|
# - appwrite-uploads:/storage/uploads
|
||||||
|
|
||||||
influxdb:
|
influxdb:
|
||||||
image: influxdb:1.8-alpine
|
image: influxdb:1.8-alpine
|
||||||
|
|
|
@ -62,7 +62,7 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- mariadb
|
- mariadb
|
||||||
- redis
|
- redis
|
||||||
- clamav
|
# - clamav
|
||||||
- influxdb
|
- influxdb
|
||||||
environment:
|
environment:
|
||||||
- _APP_ENV
|
- _APP_ENV
|
||||||
|
@ -81,6 +81,7 @@ services:
|
||||||
- _APP_USAGE_STATS
|
- _APP_USAGE_STATS
|
||||||
- _APP_INFLUXDB_HOST
|
- _APP_INFLUXDB_HOST
|
||||||
- _APP_INFLUXDB_PORT
|
- _APP_INFLUXDB_PORT
|
||||||
|
- _APP_STORAGE_ANTIVIRUS=disabled
|
||||||
- _APP_STORAGE_LIMIT
|
- _APP_STORAGE_LIMIT
|
||||||
- _APP_FUNCTIONS_TIMEOUT
|
- _APP_FUNCTIONS_TIMEOUT
|
||||||
- _APP_FUNCTIONS_CONTAINERS
|
- _APP_FUNCTIONS_CONTAINERS
|
||||||
|
@ -326,14 +327,14 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- appwrite-redis:/data:rw
|
- appwrite-redis:/data:rw
|
||||||
|
|
||||||
clamav:
|
# clamav:
|
||||||
image: appwrite/clamav:1.2.0
|
# image: appwrite/clamav:1.2.0
|
||||||
container_name: appwrite-clamav
|
# container_name: appwrite-clamav
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
networks:
|
# networks:
|
||||||
- appwrite
|
# - appwrite
|
||||||
volumes:
|
# volumes:
|
||||||
- appwrite-uploads:/storage/uploads
|
# - appwrite-uploads:/storage/uploads
|
||||||
|
|
||||||
influxdb:
|
influxdb:
|
||||||
image: influxdb:1.6
|
image: influxdb:1.6
|
||||||
|
|
|
@ -36,7 +36,7 @@ class ComposeTest extends TestCase
|
||||||
|
|
||||||
public function testServices()
|
public function testServices()
|
||||||
{
|
{
|
||||||
$this->assertCount(17, $this->object->getServices());
|
$this->assertCount(16, $this->object->getServices());
|
||||||
$this->assertEquals('appwrite-telegraf', $this->object->getService('telegraf')->getContainerName());
|
$this->assertEquals('appwrite-telegraf', $this->object->getService('telegraf')->getContainerName());
|
||||||
$this->assertEquals('appwrite', $this->object->getService('appwrite')->getContainerName());
|
$this->assertEquals('appwrite', $this->object->getService('appwrite')->getContainerName());
|
||||||
$this->assertEquals('', $this->object->getService('appwrite')->getImageVersion());
|
$this->assertEquals('', $this->object->getService('appwrite')->getImageVersion());
|
||||||
|
|
Loading…
Reference in a new issue