Update build configuration and enhance command structures

- Updated macOS version in CI configuration from 13 to 15.
- Added submodule checkout step in CI for better dependency management.
- Included Ninja build system in macOS and Ubuntu CI jobs.
- Enhanced CreateContainerRequest structure to support labels.
- Added methods for label handling in CreateContainerCmd.
- Integrated EventsCmd into DockerClient and added related tests.
- Improved exception handling in DockerException class.
- Updated RemoveImageCmd to support force and no-prune options.
- Added unit and integration tests for new command functionalities.

Author: perkss

.github/workflows/build_cmake.yml

@@ -11,17 +11,19 @@ env:
 
 jobs:
   macos-native-x86_64:
-    name: 'macOS 13'
+    name: 'macOS 15'
     # Use latest image, but hardcode version to avoid silent upgrades (and breaks).
     # See: https://github.com/actions/runner-images#available-images.
-    runs-on: macos-13  # Use M1 once available https://github.com/github/roadmap/issues/528
+    runs-on: macos-15  # Use M1 once available https://github.com/github/roadmap/issues/528
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Clang version
         run: clang --version
       - name: cmake version
         run: cmake -version
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
       - name: install docker
         run: |
             brew install colima docker
@@ -32,7 +34,7 @@ jobs:
 
       - name: Install Homebrew packages
         run: |
-          brew install cmake boost spdlog nlohmann-json llvm curl
+          brew install cmake boost spdlog nlohmann-json llvm curl ninja
           ln -s "$(brew --prefix llvm)/bin/clang-format" "/usr/local/bin/clang-format"
           ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
           ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements"
@@ -46,13 +48,13 @@ jobs:
     name: "Ubuntu"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Checkout submodules
         run: git submodule update --init --recursive
       - name: Create build directory and run CMake
         run: |
           sudo apt-get -y update
-          sudo apt-get install build-essential cmake g++-10 gcc-10 libgtest-dev make libssl-dev python3-dev autotools-dev libicu-dev libbz2-dev libboost-all-dev libspdlog-dev nlohmann-json3-dev llvm curl libcurl4-openssl-dev
+          sudo apt-get install -y build-essential cmake g++-10 gcc-10 libgtest-dev make libssl-dev python3-dev autotools-dev libicu-dev libbz2-dev libboost-all-dev libspdlog-dev nlohmann-json3-dev llvm curl libcurl4-openssl-dev ninja-build
           ls
           g++ --version
           CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake -DCMAKE_BUILD_TYPE=Debug -G Ninja -S . -B build

include/create_container_cmd.hh

@@ -2,6 +2,7 @@
 #define INCLUDE_CREATE_CONTAINER_CMD_HPP
 
 #include <memory>
+#include <map>
 #include <nlohmann/json.hpp>
 
 #include "abstr_sync_docker_cmd_exec.hh"
@@ -15,6 +16,7 @@ struct CreateContainerRequest {
   std::string hostName;
   std::string name;
   std::vector<std::string> cmd;
+  std::map<std::string, std::string> labels;
 };
 
 struct HostConfig {
@@ -33,6 +35,10 @@ class CreateContainerCmd
 
   CreateContainerCmd& withCmd(const std::vector<std::string>& cmd);
 
+  CreateContainerCmd& withLabels(const std::map<std::string, std::string>& labels);
+
+  CreateContainerCmd& withLabel(const std::string& key, const std::string& value);
+
   CreateContainerRequest getRequest() { return request; }
 
   ~CreateContainerCmd() override = default;

include/docker_client.hh

@@ -2,6 +2,7 @@
 #define DOCKER_CLIENT_H
 
 #include "create_container_cmd.hh"
+#include "events_cmd.hh"
 #include "info_cmd.hh"
 #include "ping_cmd.hh"
 #include "pull_image_cmd.hh"
@@ -43,6 +44,7 @@ class DockerClient {
 
   std::shared_ptr<command::RemoveContainerCmd> removeContainerCmd(std::string id);
 
+  std::shared_ptr<command::EventsCmd> eventsCmd();
 };
 
 };  // namespace dockercpp

include/docker_exception.hh

@@ -1,8 +1,63 @@
 #ifndef DOCKER_EXCEPTION_H
 #define DOCKER_EXCEPTION_H
 
-class DockerException {
+#include <exception>
+#include <string>
 
+namespace dockercpp {
+
+class DockerException : public std::runtime_error {
+public:
+    DockerException(const std::string& message) 
+        : std::runtime_error(message), statusCode_(0) {}
+        
+    DockerException(const std::string& message, int statusCode)
+        : std::runtime_error(message), statusCode_(statusCode) {}
+
+    DockerException(const std::string& message, int statusCode, const std::string& responseBody)
+        : std::runtime_error(message), 
+          statusCode_(statusCode), 
+          responseBody_(responseBody) {}
+
+    int getStatusCode() const { return statusCode_; }
+    const std::string& getResponseBody() const { return responseBody_; }
+
+private:
+    int statusCode_;
+    std::string responseBody_;
+};
+
+// Specific Docker exceptions
+class DockerClientException : public DockerException {
+public:
+    explicit DockerClientException(const std::string& message)
+        : DockerException(message) {}
+};
+
+class NotModifiedException : public DockerException {
+public:
+    NotModifiedException(const std::string& message)
+        : DockerException(message, 304) {}
 };
 
+class NotFoundException : public DockerException {
+public:
+    NotFoundException(const std::string& message)
+        : DockerException(message, 404) {}
+};
+
+class ConflictException : public DockerException {
+public:
+    ConflictException(const std::string& message)
+        : DockerException(message, 409) {}
+};
+
+class InternalServerErrorException : public DockerException {
+public:
+    InternalServerErrorException(const std::string& message)
+        : DockerException(message, 500) {}
+};
+
+} // namespace dockercpp
+
 #endif

include/remove_container_cmd.hh

@@ -14,8 +14,9 @@ class RemoveContainerCmd
       public std::enable_shared_from_this<RemoveContainerCmd> {
  public:
   virtual void withContainerId(std::string id) = 0;
-
   virtual std::string getContainerId() = 0;
+  virtual bool hasForceEnabled() const = 0;
+  virtual RemoveContainerCmd& withForce(bool force) = 0;
 
   ~RemoveContainerCmd() {}
 
@@ -43,11 +44,18 @@ class RemoveContainerCmdImpl
   void close() override {}
 
   void withContainerId(std::string id) override;
-
   std::string getContainerId() override;
+  bool hasForceEnabled() const override { return m_force; }
+  RemoveContainerCmd& withForce(bool force) override {
+    m_force = force;
+    return *this;
+  }
 
   ~RemoveContainerCmdImpl() {}
-};
-}  // namespace dockercpp::command
+
+private:
+  bool m_force{false};
+};  // namespace dockercpp::command
+}
 
 #endif /* INCLUDE_REMOVE_CONTAINER_CMD_HPP */

include/remove_image_cmd.hh

@@ -18,9 +18,9 @@ class RemoveImageCmd : public SynchDockerCmd<std::string>,
 
   virtual bool hasNoPruneEnabled() = 0;
 
-  virtual void withForce(bool force) = 0;
+  virtual RemoveImageCmd& withForce(bool force) = 0;
 
-  virtual void withNoPrune(bool force) = 0;
+  virtual RemoveImageCmd& withNoPrune(bool force) = 0;
 
   ~RemoveImageCmd() {}
 };
@@ -44,9 +44,9 @@ class RemoveImageCmdImpl : public RemoveImageCmd,
 
   bool hasNoPruneEnabled() override;
 
-  void withForce(bool force) override;
+  RemoveImageCmd& withForce(bool force) override;
 
-  void withNoPrune(bool force) override;
+  RemoveImageCmd& withNoPrune(bool force) override;
 
   std::string exec() override;
 

include/start_container_cmd.hh

@@ -35,7 +35,7 @@ class StartContainerCmdImpl : public StartContainerCmd,
 
   std::string getContainerId() override;
 
-  ~StartContainerCmdImpl() {}
+  ~StartContainerCmdImpl() = default;
 
  private:
   std::string m_containerId;

include/stop_container_cmd.hh

@@ -33,7 +33,7 @@ class StopContainerCmdImpl : public StopContainerCmd,
 
   std::string getContainerId() override;
 
-  ~StopContainerCmdImpl() {}
+  ~StopContainerCmdImpl() = default;
 
  private:
   std::string m_containerId;

include/synch_docker_cmd.hh

@@ -29,9 +29,10 @@ class AbstrDockerCmd : SynchDockerCmd<RES_T> {
       : m_execution(std::move(execution)){};
 
   RES_T exec() override {
+    return RES_T();
   }
 
-  ~AbstrDockerCmd() {}
+  ~AbstrDockerCmd() = default;
 
  protected:
   std::unique_ptr<exec::DockerCmdSyncExec<CMD_T, RES_T>> m_execution;

src/create_container_cmd.cc

@@ -25,6 +25,18 @@ CreateContainerCmd& CreateContainerCmd::withCmd(
   return *this;
 }
 
+CreateContainerCmd& CreateContainerCmd::withLabels(
+    const std::map<std::string, std::string>& labels) {
+  request.labels = labels;
+  return *this;
+}
+
+CreateContainerCmd& CreateContainerCmd::withLabel(
+    const std::string& key, const std::string& value) {
+  request.labels[key] = value;
+  return *this;
+}
+
 CreateContainerCmdImpl::CreateContainerCmdImpl(
     std::unique_ptr<createcontainer::Exec> exec, std::string image)
     : AbstrDockerCmd<CreateContainerCmd, model::CreateContainerResponse>(
@@ -47,6 +59,10 @@ void to_json(nlohmann::json& j,
   if (!createContainerRequest.cmd.empty()) {
     j["Cmd"] = createContainerRequest.cmd;
   }
+
+  if (!createContainerRequest.labels.empty()) {
+    j["Labels"] = createContainerRequest.labels;
+  }
 }
 
 }  // namespace dockercpp::command