dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: appwrite?!

Browse Source
This commit is contained in:
Andras Bacsai
2022-09-16 14:49:01 +02:00
parent 4cc5ec9bd0
commit c8deac660d
1 changed files with 42 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
apps/api/src/lib/services/handlers.ts
View File

@@ -1374,10 +1374,6 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
const teamId = request.user.teamId; const teamId = request.user.teamId;
const { version, fqdn, destinationDocker, secrets, exposePort, network, port, workdir, image, appwrite } = await defaultServiceConfigurations({ id, teamId }) const { version, fqdn, destinationDocker, secrets, exposePort, network, port, workdir, image, appwrite } = await defaultServiceConfigurations({ id, teamId })
let isStatsEnabled = false
if (secrets.find(s => s === '_APP_USAGE_STATS=enabled')) {
isStatsEnabled = true
}
const { const {
opensslKeyV1, opensslKeyV1,
executorSecret, executorSecret,
@@ -1755,50 +1751,48 @@ async function startAppWriteService(request: FastifyRequest<ServiceStartStop>) {
}, },
}; };
if (isStatsEnabled) { dockerCompose[id].depends_on.push(`${id}-influxdb`);
dockerCompose[id].depends_on.push(`${id}-influxdb`); dockerCompose[`${id}-usage`] = {
dockerCompose[`${id}-usage`] = { image: `${image}:${version}`,
image: `${image}:${version}`, container_name: `${id}-usage`,
container_name: `${id}-usage`, labels: makeLabelForServices('appwrite'),
labels: makeLabelForServices('appwrite'), entrypoint: "usage",
entrypoint: "usage", depends_on: [
depends_on: [ `${id}-mariadb`,
`${id}-mariadb`, `${id}-influxdb`,
`${id}-influxdb`, ],
], environment: [
environment: [ "_APP_ENV=production",
"_APP_ENV=production", `_APP_OPENSSL_KEY_V1=${opensslKeyV1}`,
`_APP_OPENSSL_KEY_V1=${opensslKeyV1}`, `_APP_DB_HOST=${mariadbHost}`,
`_APP_DB_HOST=${mariadbHost}`, `_APP_DB_PORT=${mariadbPort}`,
`_APP_DB_PORT=${mariadbPort}`, `_APP_DB_SCHEMA=${mariadbDatabase}`,
`_APP_DB_SCHEMA=${mariadbDatabase}`, `_APP_DB_USER=${mariadbUser}`,
`_APP_DB_USER=${mariadbUser}`, `_APP_DB_PASS=${mariadbPassword}`,
`_APP_DB_PASS=${mariadbPassword}`, `_APP_INFLUXDB_HOST=${id}-influxdb`,
`_APP_INFLUXDB_HOST=${id}-influxdb`, "_APP_INFLUXDB_PORT=8086",
"_APP_INFLUXDB_PORT=8086", `_APP_REDIS_HOST=${id}-redis`,
`_APP_REDIS_HOST=${id}-redis`, "_APP_REDIS_PORT=6379",
"_APP_REDIS_PORT=6379", ...secrets
...secrets ],
], ...defaultComposeConfiguration(network),
...defaultComposeConfiguration(network), }
} dockerCompose[`${id}-influxdb`] = {
dockerCompose[`${id}-influxdb`] = { image: "appwrite/influxdb:1.5.0",
image: "appwrite/influxdb:1.5.0", container_name: `${id}-influxdb`,
container_name: `${id}-influxdb`, volumes: [
volumes: [ `${id}-influxdb:/var/lib/influxdb:rw`
`${id}-influxdb:/var/lib/influxdb:rw` ],
], ...defaultComposeConfiguration(network),
...defaultComposeConfiguration(network), }
} dockerCompose[`${id}-telegraf`] = {
dockerCompose[`${id}-telegraf`] = { image: "appwrite/telegraf:1.4.0",
image: "appwrite/telegraf:1.4.0", container_name: `${id}-telegraf`,
container_name: `${id}-telegraf`, environment: [
environment: [ `_APP_INFLUXDB_HOST=${id}-influxdb`,
`_APP_INFLUXDB_HOST=${id}-influxdb`, "_APP_INFLUXDB_PORT=8086",
"_APP_INFLUXDB_PORT=8086", ],
], ...defaultComposeConfiguration(network),
...defaultComposeConfiguration(network),
}
} }
const composeFile: any = { const composeFile: any = {