From fc581fa6d05ef295d665e1743aa12b2dee65b018 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Thu, 12 May 2022 11:15:16 -0600 Subject: [PATCH] minor fixes Signed-off-by: Travis Glenn Hansen --- .github/workflows/main.yml | 9 ++++++--- Dockerfile.Windows | 5 ++--- src/utils/mount.js | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b43dc9f..2370c89 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,7 +129,8 @@ jobs: - self-hosted - Linux - X64 - - csi-sanity-truenas + #- csi-sanity-truenas + - csi-sanity-zfs-generic steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 @@ -162,7 +163,8 @@ jobs: - self-hosted - Linux - X64 - - csi-sanity-truenas + #- csi-sanity-truenas + - csi-sanity-zfs-generic steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 @@ -194,7 +196,8 @@ jobs: - self-hosted - Linux - X64 - - csi-sanity-truenas + #- csi-sanity-truenas + - csi-sanity-zfs-generic steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 diff --git a/Dockerfile.Windows b/Dockerfile.Windows index bb818cb..7af6c2c 100644 --- a/Dockerfile.Windows +++ b/Dockerfile.Windows @@ -93,7 +93,6 @@ COPY --from=build /app /app WORKDIR /app # this works for both host-process and non-host-process container semantics -COPY --from=build /nodejs/node.exe . +COPY --from=build /nodejs/node.exe ./bin - -ENTRYPOINT [ "node.exe", "--expose-gc", "bin/democratic-csi" ] +ENTRYPOINT [ "bin/node.exe", "--expose-gc", "bin/democratic-csi" ] diff --git a/src/utils/mount.js b/src/utils/mount.js index eade177..0448557 100644 --- a/src/utils/mount.js +++ b/src/utils/mount.js @@ -298,7 +298,7 @@ class Mount { return false; } const mount_info = await mount.getMountDetails(path); - const is_block = filesystem.isBlockDevice(path); + const is_block = await filesystem.isBlockDevice(path); if (mount_info.fstype == "devtmpfs" && is_block) { return true; }