Ubuntu 23.04 and 23.10 added

example/add_docker_to_matrix.sh

@@ -5,7 +5,7 @@ set -e
 shopt -s nullglob
 for package_json in $(find . -name '*.json')
 do
-  jq '.DockerMatrix.ImageNames += [ "debian12"  ]' ${package_json} > ${package_json}.test
+  jq '.DockerMatrix.ImageNames += [ "ubuntu2310"  ]' ${package_json} > ${package_json}.test
   mv ${package_json}.test ${package_json}
 done
 shopt -u nullglob

example/docker/debian11/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && \
       build-essential binutils lsb-release make git libssl-dev openssh-server wget && \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" -O cmake.sh && \
+RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
     chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh

example/docker/ubuntu2004/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && \
       build-essential cmake make libssl-dev coreutils lsb-release wget && \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" -O cmake.sh && \
+RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
     chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh

example/docker/ubuntu2204/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update && \
       	coreutils lsb-release build-essential  openssh-server git libssl-dev wget && \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" -O cmake.sh && \
+RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
     chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh

example/docker/ubuntu2304/Dockerfile

@@ -0,0 +1,27 @@
+FROM ubuntu:23.04
+
+USER root
+RUN echo root:1234 | chpasswd
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      	coreutils lsb-release build-essential  openssh-server git libssl-dev wget && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
+    chmod +x cmake.sh && \
+    ./cmake.sh --skip-license --prefix=/usr/local && \
+    rm ./cmake.sh
+
+RUN apt-get update && \
+    apt-get purge -y \
+      wget && \
+      rm -rf /var/lib/apt/lists/*
+
+RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
+RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc
+
+RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+RUN mkdir -p /run/sshd
+
+ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]

example/docker/ubuntu2310/Dockerfile

@@ -0,0 +1,27 @@
+FROM ubuntu:23.10
+
+USER root
+RUN echo root:1234 | chpasswd
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      	coreutils lsb-release build-essential  openssh-server git libssl-dev wget && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
+    chmod +x cmake.sh && \
+    ./cmake.sh --skip-license --prefix=/usr/local && \
+    rm ./cmake.sh
+
+RUN apt-get update && \
+    apt-get purge -y \
+      wget && \
+      rm -rf /var/lib/apt/lists/*
+
+RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
+RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc
+
+RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+RUN mkdir -p /run/sshd
+
+ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]

example/package/ba-logger/ba-logger_debug.json

@@ -32,7 +32,9 @@
       "ubuntu2004",
       "debian11",
       "ubuntu2204",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/ba-logger/ba-logger_release.json

@@ -32,7 +32,9 @@
       "ubuntu2004",
       "debian11",
       "ubuntu2204",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/boost/boost_debug.json

@@ -29,7 +29,9 @@
       "ubuntu2204",
       "fleet-os-2",
       "debian11",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/boost/boost_release.json

@@ -29,7 +29,9 @@
       "ubuntu2204",
       "fleet-os-2",
       "debian11",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/bzip2/bzip2_debug.json

@@ -27,7 +27,9 @@
       "debian11",
       "fleet-os-2",
       "ubuntu2204",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/bzip2/bzip2_release.json

@@ -27,7 +27,9 @@
       "debian11",
       "fleet-os-2",
       "ubuntu2204",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/curl/curl_debug.json

@@ -30,7 +30,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/curl/curl_release.json

@@ -30,7 +30,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/cxxopts/cxxopts_v3_debug.json

@@ -30,7 +30,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/cxxopts/cxxopts_v3_release.json

@@ -30,7 +30,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/expat/expat_debug.json

@@ -29,7 +29,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/expat/expat_release.json

@@ -29,7 +29,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/fleet-protocol-internal-client/internal_client_debug.json

@@ -0,0 +1,40 @@
+{
+  "Env": {},
+  "DependsOn": [
+    "pahomqttc"
+  ],
+  "Git": {
+    "URI": "https://github.com/bringauto/internal-client-cpp.git",
+    "Revision": "v1.0.0"
+  },
+  "Build": {
+    "CMake": {
+      "Defines": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "BRINGAUTO_INSTALL": "ON",
+        "BRINGAUTO_PACKAGE": "ON",
+        "BRINGAUTO_SYSTEM_DEP": "ON"
+      }
+    }
+  },
+  "Package": {
+    "Name": "internal-client",
+    "VersionTag": "v1.0.0",
+    "PlatformString": {
+      "Mode": "auto"
+    },
+    "IsLibrary": true,
+    "IsDevLib": true,
+    "IsDebug": true
+  },
+  "DockerMatrix": {
+    "ImageNames": [
+      "ubuntu2004",
+      "ubuntu2204",
+      "debian12",
+      "debian11",
+      "ubuntu2304",
+      "ubuntu2310"
+    ]
+  }
+}

example/package/fleet-protocol-internal-client/internal_client_release.json

@@ -0,0 +1,39 @@
+{
+  "Env": {},
+  "DependsOn": [
+    "pahomqttc"
+  ],
+  "Git": {
+    "URI": "https://github.com/bringauto/internal-client-cpp.git",
+    "Revision": "v1.0.0"
+  },
+  "Build": {
+    "CMake": {
+      "Defines": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BRINGAUTO_INSTALL": "ON",
+        "BRINGAUTO_PACKAGE": "ON",
+        "BRINGAUTO_SYSTEM_DEP": "ON"
+      }
+    }
+  },
+  "Package": {
+    "Name": "internal-client",
+    "VersionTag": "v1.0.0",
+    "PlatformString": {
+      "Mode": "auto"
+    },
+    "IsLibrary": true,
+    "IsDevLib": true,
+    "IsDebug": false
+  },
+  "DockerMatrix": {
+    "ImageNames": [
+      "ubuntu2204",
+      "debian12",
+      "debian11",
+      "ubuntu2304",
+      "ubuntu2310"
+    ]
+  }
+}

example/package/gtest/gtest_debug.json

@@ -27,7 +27,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/gtest/gtest_release.json

@@ -27,7 +27,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/libosmium/libosmium_debug.json

@@ -38,7 +38,9 @@
       "debian11",
       "fleet-os-2",
       "ubuntu2204",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/libosmium/libosmium_release.json

@@ -38,7 +38,9 @@
       "debian11",
       "fleet-os-2",
       "ubuntu2204",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/lz4/lz4_debug.json

@@ -29,7 +29,9 @@
       "ubuntu2204",
       "fleet-os-2",
       "debian11",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/lz4/lz4_release.json

@@ -29,7 +29,9 @@
       "ubuntu2204",
       "fleet-os-2",
       "debian11",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/modbuspp/modbuspp_debug.json

@@ -28,7 +28,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }

example/package/modbuspp/modbuspp_release.json

@@ -28,7 +28,9 @@
       "ubuntu2004",
       "debian11",
       "fleet-os-2",
-      "debian12"
+      "debian12",
+      "ubuntu2304",
+      "ubuntu2310"
     ]
   }
 }