From 61805cf694c79dce50d76f3986106290f9edad36 Mon Sep 17 00:00:00 2001 From: Jan Kubalek Date: Tue, 12 Dec 2023 13:45:14 +0100 Subject: [PATCH] Debian 12 aded --- example/add_docker_to_matrix.sh | 2 +- example/docker/debian12/Dockerfile | 27 +++++++++++++++++++ example/docker/fleet-os-2/init_toolchain.sh | 4 +-- .../package/ba-logger/ba-logger_debug.json | 3 ++- .../package/ba-logger/ba-logger_release.json | 3 ++- example/package/boost/boost_debug.json | 3 ++- example/package/boost/boost_release.json | 3 ++- example/package/bzip2/bzip2_debug.json | 3 ++- example/package/bzip2/bzip2_release.json | 3 ++- example/package/curl/curl_debug.json | 3 ++- example/package/curl/curl_release.json | 3 ++- example/package/cxxopts/cxxopts_v3_debug.json | 3 ++- .../package/cxxopts/cxxopts_v3_release.json | 3 ++- example/package/expat/expat_debug.json | 3 ++- example/package/expat/expat_release.json | 3 ++- example/package/gtest/gtest_debug.json | 3 ++- example/package/gtest/gtest_release.json | 3 ++- .../package/libosmium/libosmium_debug.json | 3 ++- .../package/libosmium/libosmium_release.json | 3 ++- example/package/lz4/lz4_debug.json | 3 ++- example/package/lz4/lz4_release.json | 3 ++- example/package/modbuspp/modbuspp_debug.json | 3 ++- .../package/modbuspp/modbuspp_release.json | 3 ++- example/package/msgpack/msgpack_debug.json | 3 ++- example/package/msgpack/msgpack_release.json | 3 ++- .../nlohmannjson/nlohmannjson_debug.json | 3 ++- .../nlohmannjson/nlohmannjson_release.json | 3 ++- .../package/pahomqttc/pahomqttc_debug.json | 3 ++- .../package/pahomqttc/pahomqttc_release.json | 3 ++- .../pahomqttcpp/pahomqttcpp_debug.json | 3 ++- .../pahomqttcpp/pahomqttcpp_release.json | 3 ++- .../protobuf/protobuf_debug_v21.12.json | 1 + .../protobuf/protobuf_release_v21.12.json | 1 + .../package/protozero/protozero_debug.json | 3 ++- .../package/protozero/protozero_release.json | 3 ++- example/package/spdlog/spdlog_debug.json | 3 ++- example/package/spdlog/spdlog_release.json | 3 ++- .../package/statesmurf/statesmurf_debug.json | 3 ++- .../statesmurf/statesmurf_release.json | 3 ++- example/package/zlib/zlib_debug.json | 3 ++- example/package/zlib/zlib_release.json | 3 ++- 41 files changed, 104 insertions(+), 39 deletions(-) create mode 100644 example/docker/debian12/Dockerfile diff --git a/example/add_docker_to_matrix.sh b/example/add_docker_to_matrix.sh index 971967b..2d32440 100755 --- a/example/add_docker_to_matrix.sh +++ b/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 += [ "fleet-os-2" ]' ${package_json} > ${package_json}.test + jq '.DockerMatrix.ImageNames += [ "debian12" ]' ${package_json} > ${package_json}.test mv ${package_json}.test ${package_json} done shopt -u nullglob \ No newline at end of file diff --git a/example/docker/debian12/Dockerfile b/example/docker/debian12/Dockerfile new file mode 100644 index 0000000..5a9ddff --- /dev/null +++ b/example/docker/debian12/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:12.0 + +USER root +RUN echo root:1234 | chpasswd + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y \ + 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.25.2/cmake-3.25.2-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"] diff --git a/example/docker/fleet-os-2/init_toolchain.sh b/example/docker/fleet-os-2/init_toolchain.sh index 0f956fe..cf71620 100644 --- a/example/docker/fleet-os-2/init_toolchain.sh +++ b/example/docker/fleet-os-2/init_toolchain.sh @@ -6,8 +6,8 @@ INSTALL_DIR="$1" TOOLS_INSTALL_DIR="$2" TMP_DIR="/tmp/toolchain-install" -TOOLS_PACKAGE_URI="https://github.com/bringauto/packager/releases/download/v0.2.0-rc/bringauto-packager-tools_v0.2.0_x86-64-linux.zip" -TOOLCHAIN_PACKAGE_URI="https://gitlab.bringauto.com/bringauto-public/fleet-os-toolchain/-/raw/master/fleet-os/v2.2.0/fleet-os-toolchain_v2.2.0_raspberrypi4-64.zip" +TOOLS_PACKAGE_URI="https://github.com/bringauto/packager/releases/download/v0.3.0/bringauto-packager-tools_v0.3.0_x86-64-linux.zip" +TOOLCHAIN_PACKAGE_URI="https://gitlab.bringauto.com/bringauto-public/fleet-os-toolchain/-/raw/master/fleet-os/v2.3.0/fleet-os-toolchain_v2.3.0_raspberrypi4-64.zip" if [[ ${INSTALL_DIR} = "" ]] then diff --git a/example/package/ba-logger/ba-logger_debug.json b/example/package/ba-logger/ba-logger_debug.json index 3ada8cd..f42d53f 100644 --- a/example/package/ba-logger/ba-logger_debug.json +++ b/example/package/ba-logger/ba-logger_debug.json @@ -31,7 +31,8 @@ "ImageNames": [ "ubuntu2004", "debian11", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/ba-logger/ba-logger_release.json b/example/package/ba-logger/ba-logger_release.json index 71e34d1..031faa9 100644 --- a/example/package/ba-logger/ba-logger_release.json +++ b/example/package/ba-logger/ba-logger_release.json @@ -31,7 +31,8 @@ "ImageNames": [ "ubuntu2004", "debian11", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/boost/boost_debug.json b/example/package/boost/boost_debug.json index b478d66..441d23d 100644 --- a/example/package/boost/boost_debug.json +++ b/example/package/boost/boost_debug.json @@ -28,7 +28,8 @@ "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11" + "debian11", + "debian12" ] } } diff --git a/example/package/boost/boost_release.json b/example/package/boost/boost_release.json index a7af136..c6a949b 100644 --- a/example/package/boost/boost_release.json +++ b/example/package/boost/boost_release.json @@ -28,7 +28,8 @@ "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11" + "debian11", + "debian12" ] } } diff --git a/example/package/bzip2/bzip2_debug.json b/example/package/bzip2/bzip2_debug.json index 67af6d8..173ecc5 100644 --- a/example/package/bzip2/bzip2_debug.json +++ b/example/package/bzip2/bzip2_debug.json @@ -26,7 +26,8 @@ "ubuntu2004", "debian11", "fleet-os-2", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/bzip2/bzip2_release.json b/example/package/bzip2/bzip2_release.json index a0e1625..52f46d0 100644 --- a/example/package/bzip2/bzip2_release.json +++ b/example/package/bzip2/bzip2_release.json @@ -26,7 +26,8 @@ "ubuntu2004", "debian11", "fleet-os-2", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/curl/curl_debug.json b/example/package/curl/curl_debug.json index 8382ee0..1199405 100644 --- a/example/package/curl/curl_debug.json +++ b/example/package/curl/curl_debug.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/curl/curl_release.json b/example/package/curl/curl_release.json index e5e356f..f1e17b1 100644 --- a/example/package/curl/curl_release.json +++ b/example/package/curl/curl_release.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/cxxopts/cxxopts_v3_debug.json b/example/package/cxxopts/cxxopts_v3_debug.json index af712e8..e1a2f61 100644 --- a/example/package/cxxopts/cxxopts_v3_debug.json +++ b/example/package/cxxopts/cxxopts_v3_debug.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/cxxopts/cxxopts_v3_release.json b/example/package/cxxopts/cxxopts_v3_release.json index 35d79d4..7a638a7 100644 --- a/example/package/cxxopts/cxxopts_v3_release.json +++ b/example/package/cxxopts/cxxopts_v3_release.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/expat/expat_debug.json b/example/package/expat/expat_debug.json index 1905f2b..ceed19e 100644 --- a/example/package/expat/expat_debug.json +++ b/example/package/expat/expat_debug.json @@ -28,7 +28,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/expat/expat_release.json b/example/package/expat/expat_release.json index 7e896f0..80b06ae 100644 --- a/example/package/expat/expat_release.json +++ b/example/package/expat/expat_release.json @@ -28,7 +28,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/gtest/gtest_debug.json b/example/package/gtest/gtest_debug.json index 1bc3a46..6244b6d 100644 --- a/example/package/gtest/gtest_debug.json +++ b/example/package/gtest/gtest_debug.json @@ -26,7 +26,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/gtest/gtest_release.json b/example/package/gtest/gtest_release.json index 731b096..565e964 100644 --- a/example/package/gtest/gtest_release.json +++ b/example/package/gtest/gtest_release.json @@ -26,7 +26,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/libosmium/libosmium_debug.json b/example/package/libosmium/libosmium_debug.json index 97ec5e0..1e76f5d 100644 --- a/example/package/libosmium/libosmium_debug.json +++ b/example/package/libosmium/libosmium_debug.json @@ -37,7 +37,8 @@ "ubuntu2004", "debian11", "fleet-os-2", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/libosmium/libosmium_release.json b/example/package/libosmium/libosmium_release.json index a3a5f4d..4ef0bfa 100644 --- a/example/package/libosmium/libosmium_release.json +++ b/example/package/libosmium/libosmium_release.json @@ -37,7 +37,8 @@ "ubuntu2004", "debian11", "fleet-os-2", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/lz4/lz4_debug.json b/example/package/lz4/lz4_debug.json index 5a6fd2f..2a316c2 100644 --- a/example/package/lz4/lz4_debug.json +++ b/example/package/lz4/lz4_debug.json @@ -28,7 +28,8 @@ "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11" + "debian11", + "debian12" ] } } diff --git a/example/package/lz4/lz4_release.json b/example/package/lz4/lz4_release.json index 753a1fd..10bdb91 100644 --- a/example/package/lz4/lz4_release.json +++ b/example/package/lz4/lz4_release.json @@ -28,7 +28,8 @@ "ubuntu2004", "ubuntu2204", "fleet-os-2", - "debian11" + "debian11", + "debian12" ] } } diff --git a/example/package/modbuspp/modbuspp_debug.json b/example/package/modbuspp/modbuspp_debug.json index 084024e..d89f4ed 100644 --- a/example/package/modbuspp/modbuspp_debug.json +++ b/example/package/modbuspp/modbuspp_debug.json @@ -27,7 +27,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/modbuspp/modbuspp_release.json b/example/package/modbuspp/modbuspp_release.json index a175d2b..2cdd4a2 100644 --- a/example/package/modbuspp/modbuspp_release.json +++ b/example/package/modbuspp/modbuspp_release.json @@ -27,7 +27,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/msgpack/msgpack_debug.json b/example/package/msgpack/msgpack_debug.json index b841203..e7a44d1 100644 --- a/example/package/msgpack/msgpack_debug.json +++ b/example/package/msgpack/msgpack_debug.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/msgpack/msgpack_release.json b/example/package/msgpack/msgpack_release.json index 690f953..a98bf6d 100644 --- a/example/package/msgpack/msgpack_release.json +++ b/example/package/msgpack/msgpack_release.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/nlohmannjson/nlohmannjson_debug.json b/example/package/nlohmannjson/nlohmannjson_debug.json index 4f686cb..773ede8 100644 --- a/example/package/nlohmannjson/nlohmannjson_debug.json +++ b/example/package/nlohmannjson/nlohmannjson_debug.json @@ -28,7 +28,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/nlohmannjson/nlohmannjson_release.json b/example/package/nlohmannjson/nlohmannjson_release.json index 776fb49..90371dc 100644 --- a/example/package/nlohmannjson/nlohmannjson_release.json +++ b/example/package/nlohmannjson/nlohmannjson_release.json @@ -28,7 +28,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/pahomqttc/pahomqttc_debug.json b/example/package/pahomqttc/pahomqttc_debug.json index 6f11def..95bddac 100644 --- a/example/package/pahomqttc/pahomqttc_debug.json +++ b/example/package/pahomqttc/pahomqttc_debug.json @@ -32,7 +32,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/pahomqttc/pahomqttc_release.json b/example/package/pahomqttc/pahomqttc_release.json index 3d537de..94d5a4e 100644 --- a/example/package/pahomqttc/pahomqttc_release.json +++ b/example/package/pahomqttc/pahomqttc_release.json @@ -32,7 +32,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/pahomqttcpp/pahomqttcpp_debug.json b/example/package/pahomqttcpp/pahomqttcpp_debug.json index 541676f..410bb53 100644 --- a/example/package/pahomqttcpp/pahomqttcpp_debug.json +++ b/example/package/pahomqttcpp/pahomqttcpp_debug.json @@ -34,7 +34,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/pahomqttcpp/pahomqttcpp_release.json b/example/package/pahomqttcpp/pahomqttcpp_release.json index 8358f45..64eabbe 100644 --- a/example/package/pahomqttcpp/pahomqttcpp_release.json +++ b/example/package/pahomqttcpp/pahomqttcpp_release.json @@ -34,7 +34,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/protobuf/protobuf_debug_v21.12.json b/example/package/protobuf/protobuf_debug_v21.12.json index aef0124..bf13a20 100644 --- a/example/package/protobuf/protobuf_debug_v21.12.json +++ b/example/package/protobuf/protobuf_debug_v21.12.json @@ -30,6 +30,7 @@ "ubuntu2204", "ubuntu2004", "debian11", + "debian12", "fleet-os-2" ] } diff --git a/example/package/protobuf/protobuf_release_v21.12.json b/example/package/protobuf/protobuf_release_v21.12.json index 12e3c2e..5a22657 100644 --- a/example/package/protobuf/protobuf_release_v21.12.json +++ b/example/package/protobuf/protobuf_release_v21.12.json @@ -30,6 +30,7 @@ "ubuntu2204", "ubuntu2004", "debian11", + "debian12", "fleet-os-2" ] } diff --git a/example/package/protozero/protozero_debug.json b/example/package/protozero/protozero_debug.json index 908d9dd..9b87820 100644 --- a/example/package/protozero/protozero_debug.json +++ b/example/package/protozero/protozero_debug.json @@ -28,7 +28,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/protozero/protozero_release.json b/example/package/protozero/protozero_release.json index c505a38..d0d1ef2 100644 --- a/example/package/protozero/protozero_release.json +++ b/example/package/protozero/protozero_release.json @@ -28,7 +28,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/spdlog/spdlog_debug.json b/example/package/spdlog/spdlog_debug.json index 97995ea..769a9e9 100644 --- a/example/package/spdlog/spdlog_debug.json +++ b/example/package/spdlog/spdlog_debug.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/spdlog/spdlog_release.json b/example/package/spdlog/spdlog_release.json index 5ae985c..150fa8c 100644 --- a/example/package/spdlog/spdlog_release.json +++ b/example/package/spdlog/spdlog_release.json @@ -29,7 +29,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/statesmurf/statesmurf_debug.json b/example/package/statesmurf/statesmurf_debug.json index 8176ade..62dc935 100644 --- a/example/package/statesmurf/statesmurf_debug.json +++ b/example/package/statesmurf/statesmurf_debug.json @@ -32,7 +32,8 @@ "ImageNames": [ "ubuntu2004", "debian11", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/statesmurf/statesmurf_release.json b/example/package/statesmurf/statesmurf_release.json index fd1ee18..7729f9f 100644 --- a/example/package/statesmurf/statesmurf_release.json +++ b/example/package/statesmurf/statesmurf_release.json @@ -32,7 +32,8 @@ "ImageNames": [ "ubuntu2004", "debian11", - "ubuntu2204" + "ubuntu2204", + "debian12" ] } } diff --git a/example/package/zlib/zlib_debug.json b/example/package/zlib/zlib_debug.json index 4946024..d9987dd 100644 --- a/example/package/zlib/zlib_debug.json +++ b/example/package/zlib/zlib_debug.json @@ -26,7 +26,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } } diff --git a/example/package/zlib/zlib_release.json b/example/package/zlib/zlib_release.json index a888ef4..95cc29e 100644 --- a/example/package/zlib/zlib_release.json +++ b/example/package/zlib/zlib_release.json @@ -26,7 +26,8 @@ "ubuntu2204", "ubuntu2004", "debian11", - "fleet-os-2" + "fleet-os-2", + "debian12" ] } }