Merge pull request #2 from coding-cpp/fix/1

add isDocker function

Author: Jadit19

docker/build.dockerfile

@@ -0,0 +1,22 @@
+FROM alpine:3.20.2 AS builder
+
+RUN apk update && apk add --no-cache g++ make cmake
+
+WORKDIR /app
+
+COPY example /app/example
+COPY include /app/include
+COPY lib /app/lib
+COPY src /app/src
+COPY CMakeLists.txt /app/CMakeLists.txt
+
+RUN mkdir build && cd build && cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_EXE_LINKER_FLAGS="-static" .. && make
+RUN chmod +x /app/build/brewtils
+
+FROM scratch
+
+WORKDIR /app
+
+COPY --from=builder /app/build/brewtils /app/brewtils
+
+ENTRYPOINT ["/app/brewtils"]

example/main.cpp

@@ -56,6 +56,10 @@ int main(int argc, char **argv) {
     logger::info(file);
   }
 
+  logger::info("---------------------------");
+  logger::info(brewtils::os::isDocker() ? "Running in Docker"
+                                        : "Not in Docker");
+
   logger::info("---------------------------");
   logger::info(brewtils::os::file::getMimeType("test.txt"));
 

include/brewtils/os.h

@@ -12,6 +12,8 @@ std::string joinPath(const std::string &path1,
 
 std::string basePath(const std::string &path) noexcept(true);
 
+bool isDocker() noexcept(true);
+
 } // namespace os
 
 } // namespace brewtils

include/brewtils/os/file.h

@@ -3,8 +3,6 @@
 #include <filesystem>
 #include <fstream>
 #include <map>
-#include <set>
-#include <string>
 
 #include <logger/log.h>
 

src/os.cpp

@@ -18,3 +18,7 @@ std::string brewtils::os::basePath(const std::string &path) noexcept(true) {
   size_t pos = base.find_last_of('/');
   return base.substr(pos + 1, base.size());
 }
+
+bool brewtils::os::isDocker() noexcept(true) {
+  return brewtils::os::file::exists("/.dockerenv");
+}

src/os/dir.cpp

@@ -57,8 +57,16 @@ brewtils::os::dir::tree(const std::string &path) noexcept(false) {
   std::set<std::string> files;
   for (const std::filesystem::directory_entry &entry :
        std::filesystem::recursive_directory_iterator(path)) {
-    relativePath = std::filesystem::relative(entry.path(), path).string();
-    files.insert(relativePath);
+    try {
+      if (!entry.is_regular_file() && !entry.is_directory()) {
+        continue;
+      }
+
+      relativePath = std::filesystem::relative(entry.path(), path).string();
+      files.insert(relativePath);
+    } catch (const std::filesystem::filesystem_error &e) {
+      continue;
+    }
   }
 
   return files;