Merge pull request #577 from mtconnect/fix_docker_build_issues_with_alpine

For docker alpine build, added bash because of m4 and changed verion to 3.22

Author: wsobel

CMakeLists.txt

@@ -2,7 +2,7 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 6)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 6)
+set(AGENT_VERSION_BUILD 7)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent

agent_lib/CMakeLists.txt

@@ -393,7 +393,7 @@ target_include_directories(
 target_link_libraries(
   agent_lib
   PUBLIC
-  boost::boost LibXml2::LibXml2 date::date-tz openssl::openssl
+  boost::boost LibXml2::LibXml2 date::date openssl::openssl
   nlohmann_json::nlohmann_json mqtt_cpp::mqtt_cpp 
   rapidjson BZip2::BZip2
 

cmake/osx_no_app_or_frameworks.cmake

@@ -8,6 +8,6 @@ set(CMAKE_FIND_FRAMEWORK NEVER FORCE)
 # ms suffix which was added post 11.
 if (APPLE)
 #  set(COVERAGE_FLAGS "-fcoverage-mapping -fprofile-instr-generate")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++20")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedef -Wno-deprecated-declarations -Wall")
 endif()

conanfile.py

@@ -68,7 +68,7 @@ class MTConnectAgentConan(ConanFile):
 
         "openssl*:shared": False,
 
-        "date*:use_system_tz_db": True
+        "date*:header_only": True
         }
 
     exports_sources = "*", "!build", "!test_package/build", "!*~"
@@ -112,14 +112,14 @@ def tool_requires_version(self, package, version):
     def build_requirements(self):
         self.tool_requires_version("cmake", [3, 26, 4])
         if self.options.with_docs:
-            self.tool_requires_version("doxygen", [1, 14, 0])
+            self.tool_requires_version("doxygen", [1, 15, 0])
 
     def requirements(self):
         self.requires("boost/1.88.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("libxml2/2.14.5", headers=True, libs=True, visible=True, transitive_headers=True, transitive_libs=True)
         self.requires("date/3.0.4", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("nlohmann_json/3.12.0", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
-        self.requires("openssl/3.5.4", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
+        self.requires("openssl/3.6.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
         self.requires("rapidjson/cci.20230929", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
         self.requires("mqtt_cpp/13.2.2", headers=True, libs=False, transitive_headers=True, transitive_libs=False)
         self.requires("bzip2/1.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)

docker/alpine/Dockerfile

@@ -29,7 +29,7 @@
 # ---------------------------------------------------------------------
 
 # base image - alpine 3.18
-FROM alpine:3.19 AS os
+FROM alpine:3.22 AS os
 
 # ---------------------------------------------------------------------
 # build
@@ -53,6 +53,7 @@ ENV CONAN_PROFILE="$HOME/agent/cppagent/conan/profiles/docker"
 RUN  apk --update add \
        autoconf \
        automake \
+       bash \
        cmake \
        g++ \
        gcompat \

src/mtconnect/agent.cpp

@@ -1019,7 +1019,7 @@ namespace mtconnect {
       stringstream msg;
       msg << "Device " << *device->getUuid() << " already exists. "
           << " Update not supported yet";
-      throw msg;
+      throw msg.str();
     }
     else
     {

src/mtconnect/configuration/agent_config.cpp

@@ -941,7 +941,7 @@ namespace mtconnect::configuration {
     loadAdapters(config, options);
 
     m_afterAgentHooks.exec(*this);
-    
+
 #ifdef WITH_PYTHON
     configurePython(config, options);
 #endif

src/mtconnect/entity/entity.hpp

@@ -716,73 +716,75 @@ namespace mtconnect {
 
       return changed;
     }
-    
+
     /// @brief variant visitor to output Value to stream
     struct StreamOutputVisitor
     {
       /// @brief constructor
       /// @param os the output stream
-      StreamOutputVisitor(std::ostream& os) : m_os(os) {}
-      
-      void operator()(const std::monostate&) {
-        m_os << "null";
-      }
-      
-      void operator()(const EntityPtr& entity) {
+      StreamOutputVisitor(std::ostream &os) : m_os(os) {}
+
+      void operator()(const std::monostate &) { m_os << "null"; }
+
+      void operator()(const EntityPtr &entity)
+      {
         const auto &id = entity->getIdentity();
         m_os << "Entity(" << entity->getName() << ":";
         StreamOutputVisitor visitor(m_os);
         std::visit(visitor, id);
         m_os << ")";
       }
-      
-      void operator()(const EntityList& list) {
+
+      void operator()(const EntityList &list)
+      {
         m_os << "EntityList[";
-        for (auto e : list) {
+        for (auto e : list)
+        {
           StreamOutputVisitor visitor(m_os);
           visitor(e);
           m_os << " ";
         }
         m_os << "]";
       }
-      
-      void operator()(const DataSet& dataSet) {
-        m_os << "DataSet(" << dataSet.size() << " items)";
-      }
-      
-      void operator()(const QName& qname) {
-        m_os << qname.str();
-      }
-      
-      void operator()(const Vector& vec) {
+
+      void operator()(const DataSet &dataSet) { m_os << "DataSet(" << dataSet.size() << " items)"; }
+
+      void operator()(const QName &qname) { m_os << qname.str(); }
+
+      void operator()(const Vector &vec)
+      {
         m_os << "Vector[";
-        for (const auto &v : vec) {
+        for (const auto &v : vec)
+        {
           m_os << v << " ";
         }
         m_os << "]";
       }
-      
+
       template <typename T>
-      void operator()(const T& value) {
+      void operator()(const T &value)
+      {
         m_os << value;
       }
-      
-      std::ostream& m_os;
+
+      std::ostream &m_os;
     };
-    
+
     /// @brief output operator for Value
     /// @param os the output stream
     /// @param v the Value to output
-    inline std::ostream& operator<<(std::ostream& os, const Value &v) {
+    inline std::ostream &operator<<(std::ostream &os, const Value &v)
+    {
       StreamOutputVisitor visitor(os);
       std::visit(visitor, v);
       return os;
     }
-    
+
     /// @brief output operator for Value
     /// @param os the output stream
     /// @param v the Value to output
-    inline std::ostream& operator<<(std::ostream& os, const EntityPtr &v) {
+    inline std::ostream &operator<<(std::ostream &os, const EntityPtr &v)
+    {
       StreamOutputVisitor visitor(os);
       visitor(v);
       return os;

src/mtconnect/entity/requirement.cpp

@@ -186,12 +186,13 @@ namespace mtconnect {
         // If there isa a time portion in the string, parse the time
         if (arg.find('T') != string::npos)
         {
-          in >> std::setw(6) >> date::parse("%FT%T", ts);
+          in >> std::setw(6);
+          date::from_stream(in, "%FT%T", ts);
         }
         else
         {
           // Just parse the date
-          in >> date::parse("%F", ts);
+          date::from_stream(in, "%F", ts);
         }
       }
       void operator()(const string &arg, Vector &r)

src/mtconnect/pipeline/response_document.cpp

@@ -29,6 +29,7 @@
 #include "mtconnect/entity/xml_parser.hpp"
 #include "mtconnect/observation/observation.hpp"
 #include "mtconnect/pipeline/timestamp_extractor.hpp"
+#include "mtconnect/utilities.hpp"
 
 using namespace std;
 
@@ -280,20 +281,6 @@ namespace mtconnect::pipeline {
     });
   }
 
-  inline static Timestamp parseTimestamp(const std::string value)
-  {
-    Timestamp ts;
-    istringstream in(value);
-    in >> std::setw(6) >> date::parse("%FT%T", ts);
-    if (!in.good())
-    {
-      LOG(error) << "Cound not parse XML timestamp: " << value;
-      ts = std::chrono::system_clock::now();
-    }
-
-    return ts;
-  }
-
   inline static DataItemPtr findDataItem(const std::string &name, DevicePtr device,
                                          const entity::Properties &properties)
   {