Merge branch 'steveiliop56-develop' into develop
This commit is contained in:
commit
0f129a7809
4 changed files with 5 additions and 1 deletions
|
@ -80,6 +80,7 @@ services:
|
||||||
# Dev mode
|
# Dev mode
|
||||||
- ${PWD}/packages/worker/src:/app/packages/worker/src
|
- ${PWD}/packages/worker/src:/app/packages/worker/src
|
||||||
# Production mode
|
# Production mode
|
||||||
|
- /:/host/root:ro
|
||||||
- /proc:/host/proc:ro
|
- /proc:/host/proc:ro
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- ${PWD}/.env:/app/.env
|
- ${PWD}/.env:/app/.env
|
||||||
|
|
|
@ -76,6 +76,7 @@ services:
|
||||||
environment:
|
environment:
|
||||||
NODE_ENV: production
|
NODE_ENV: production
|
||||||
volumes:
|
volumes:
|
||||||
|
- /:/host/root:ro
|
||||||
- /proc:/host/proc
|
- /proc:/host/proc
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- ${PWD}/.env:/app/.env
|
- ${PWD}/.env:/app/.env
|
||||||
|
|
|
@ -78,6 +78,7 @@ services:
|
||||||
NODE_ENV: production
|
NODE_ENV: production
|
||||||
volumes:
|
volumes:
|
||||||
# Core
|
# Core
|
||||||
|
- /:/host/root:ro
|
||||||
- /proc:/host/proc
|
- /proc:/host/proc
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
# App
|
# App
|
||||||
|
|
|
@ -36,7 +36,8 @@ export class SystemExecutors {
|
||||||
this.logger.error(`Unable to read /host/proc/meminfo: ${e}`);
|
this.logger.error(`Unable to read /host/proc/meminfo: ${e}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const [disk0] = await si.fsSize();
|
const disks = await si.fsSize();
|
||||||
|
const disk0 = disks.find((disk) => disk.mount.startsWith('/host/root'));
|
||||||
|
|
||||||
return {
|
return {
|
||||||
cpu: { load: currentLoad },
|
cpu: { load: currentLoad },
|
||||||
|
|
Loading…
Reference in a new issue