From 42349c5a27bb0b8f9c3c4503e09ec20122c3342d Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Tue, 28 Nov 2023 22:02:52 +0100 Subject: [PATCH] fix(worker): no need to mount host --- docker-compose.dev.yml | 2 -- docker-compose.prod.yml | 1 - packages/cli/assets/docker-compose.yml | 2 -- packages/worker/src/services/system/system.executors.ts | 3 +-- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ff732da9..5f85b16d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -60,7 +60,6 @@ services: context: . dockerfile: ./packages/worker/Dockerfile.dev container_name: tipi-worker - user: root healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:3000/healthcheck'] interval: 5s @@ -80,7 +79,6 @@ services: # Dev mode - ${PWD}/packages/worker/src:/app/packages/worker/src # Production mode - - /:/host/root:ro - /proc:/host/proc:ro - /var/run/docker.sock:/var/run/docker.sock - ${PWD}/.env:/app/.env diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 0e0a5db5..309eaf22 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -76,7 +76,6 @@ services: environment: NODE_ENV: production volumes: - - /:/host/root:ro - /proc:/host/proc - /var/run/docker.sock:/var/run/docker.sock - ${PWD}/.env:/app/.env diff --git a/packages/cli/assets/docker-compose.yml b/packages/cli/assets/docker-compose.yml index e5d6d40d..4aa6fe06 100644 --- a/packages/cli/assets/docker-compose.yml +++ b/packages/cli/assets/docker-compose.yml @@ -60,7 +60,6 @@ services: container_name: tipi-worker image: ghcr.io/runtipi/worker:${TIPI_VERSION} restart: unless-stopped - user: root healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:3000/healthcheck'] interval: 5s @@ -78,7 +77,6 @@ services: NODE_ENV: production volumes: # Core - - /:/host/root:ro - /proc:/host/proc - /var/run/docker.sock:/var/run/docker.sock # App diff --git a/packages/worker/src/services/system/system.executors.ts b/packages/worker/src/services/system/system.executors.ts index 5069d2d7..80f63421 100644 --- a/packages/worker/src/services/system/system.executors.ts +++ b/packages/worker/src/services/system/system.executors.ts @@ -36,8 +36,7 @@ export class SystemExecutors { this.logger.error(`Unable to read /host/proc/meminfo: ${e}`); } - const disks = await si.fsSize(); - const disk0 = disks.find((disk) => disk.mount.startsWith('/host/root')) || disks[0]; + const [disk0] = await si.fsSize(); return { cpu: { load: currentLoad },