From 744749d22b7d5601fbfc54c1d855daf35dc5532e Mon Sep 17 00:00:00 2001 From: Ulric Qin Date: Mon, 16 Oct 2023 12:25:09 +0800 Subject: [PATCH] remove rust wait tool --- docker/Dockerfile.goreleaser | 3 +-- docker/Dockerfile.goreleaser.arm64 | 2 -- docker/compose-bridge/etc-categraf/input.disk/disk.toml | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile.goreleaser b/docker/Dockerfile.goreleaser index eaa93c817..3f15c73da 100644 --- a/docker/Dockerfile.goreleaser +++ b/docker/Dockerfile.goreleaser @@ -5,8 +5,7 @@ WORKDIR /app ADD n9e /app/ ADD etc /app/ ADD integrations /app/integrations/ -ADD --chmod=755 https://github.com/ufoscout/docker-compose-wait/releases/download/2.11.0/wait_x86_64 /wait -RUN chmod +x /wait && pip install requests +RUN pip install requests EXPOSE 17000 diff --git a/docker/Dockerfile.goreleaser.arm64 b/docker/Dockerfile.goreleaser.arm64 index 06d1e8ce9..1c235f33d 100644 --- a/docker/Dockerfile.goreleaser.arm64 +++ b/docker/Dockerfile.goreleaser.arm64 @@ -1,4 +1,3 @@ -FROM flashcatcloud/toolbox:v0.0.1 as toolbox FROM --platform=$TARGETPLATFORM python:3-slim @@ -6,7 +5,6 @@ WORKDIR /app ADD n9e /app/ ADD etc /app/ ADD integrations /app/integrations/ -COPY --chmod=755 --from=toolbox /toolbox/wait_aarch64 /wait EXPOSE 17000 diff --git a/docker/compose-bridge/etc-categraf/input.disk/disk.toml b/docker/compose-bridge/etc-categraf/input.disk/disk.toml index 1f9b3fdf3..5e2541dfc 100644 --- a/docker/compose-bridge/etc-categraf/input.disk/disk.toml +++ b/docker/compose-bridge/etc-categraf/input.disk/disk.toml @@ -3,9 +3,8 @@ # # By default stats will be gathered for all mount points. # # Set mount_points will restrict the stats to only the specified mount points. -# mount_points = ["/"] +mount_points = ["/"] # Ignore mount points by filesystem type. ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs", "nsfs"] -ignore_mount_points = ["/boot", "/hostfs/containers/services", "/host/containers/services/docker"]