add fedora40 dockerfile and to build matrix

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 += [ "ubuntu2310"  ]' ${package_json} > ${package_json}.test
+  jq '.DockerMatrix.ImageNames += [ "fedora40"  ]' ${package_json} > ${package_json}.test
   mv ${package_json}.test ${package_json}
 done
 shopt -u nullglob

example/docker/debian12/Dockerfile

@@ -5,21 +5,29 @@ 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 patchelf && \
+      binutils build-essential flex git libssl-dev lsb-release make openssh-server patchelf software-properties-common && \
     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 && \
+RUN git clone --depth=1 --single-branch --branch=releases/gcc-13.2.0 git://gcc.gnu.org/git/gcc.git /gcc && \
+    cd /gcc && \
+    contrib/download_prerequisites && \
+    mkdir objdir
+
+RUN cd /gcc/objdir && \
+    ../configure --enable-languages=c,c++ --disable-multilib && \
+    make -j$(nproc) && \
+    make install
+
+ADD "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.sh" cmake.sh
+RUN 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 echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc && \
+    echo "export CC=/usr/local/bin/gcc" >> /root/.bashrc && \
+    echo "export CXX=/usr/local/bin/g++" >> /root/.bashrc && \
+    echo "export LD_LIBRARY_PATH=/usr/local/lib64" >> /root/.bashrc
 
 RUN sed -ri 's/#?PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
 RUN mkdir -p /run/sshd

example/docker/fedora40/Dockerfile

@@ -0,0 +1,23 @@
+FROM fedora:40
+
+USER root
+RUN echo root:1234 | chpasswd
+
+RUN dnf -y update && \
+    dnf -y install  \
+    automake binutils gcc gcc-c++ git kernel-devel lsb-release make openssh-server openssl-devel patchelf 
+
+ADD "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
+    ./cmake.sh --skip-license --prefix=/usr/local && \
+    rm ./cmake.sh
+
+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
+
+RUN ssh-keygen -A
+
+ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]

example/docker/fleet-os-2/Dockerfile

@@ -8,11 +8,11 @@ RUN echo root:1234 | chpasswd
 #
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      build-essential xz-utils sed git libssl-dev openssh-server wget unzip python3 make patchelf && \
+      build-essential xz-utils sed git libssl-dev openssh-server unzip python3 make patchelf && \
     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 && \
-    chmod +x cmake.sh && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh
 
@@ -33,7 +33,7 @@ COPY uname.txt /root/tools/
 
 RUN apt-get update && \
     apt-get purge -y \
-      wget unzip && \
+      unzip && \
       rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]

example/docker/ubuntu1804-aarch64/Dockerfile

@@ -5,13 +5,13 @@ RUN echo root:1234 | chpasswd
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      build-essential make libssl-dev coreutils lsb-release wget g++-8 gcc-8 gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu patchelf unzip openssh-server git && \
+    build-essential coreutils g++-8 g++-8-aarch64-linux-gnu gcc-8 gcc-8-aarch64-linux-gnu git libssl-dev lsb-release make openssh-server patchelf unzip && \
     rm -rf /var/lib/apt/lists/*
 
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-8
 
-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 && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh
 

example/docker/ubuntu2204/Dockerfile

@@ -4,9 +4,14 @@ USER root
 RUN echo root:1234 | chpasswd
 
 RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common && \
+    add-apt-repository ppa:ubuntu-toolchain-r/test
+
+    RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      	coreutils lsb-release build-essential  openssh-server git libssl-dev wget patchelf && \
-    rm -rf /var/lib/apt/lists/*
+      	coreutils lsb-release build-essential  openssh-server git libssl-dev wget gcc-13 g++-13 patchelf && \
+    rm -rf /var/lib/apt/lists/* && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13
 
 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 && \

example/docker/ubuntu2304/Dockerfile → example/docker/ubuntu2404/Dockerfile

@@ -1,27 +1,28 @@
-FROM ubuntu:23.04
+FROM ubuntu:24.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 patchelf && \
+      	build-essential \
+        coreutils \
+        git \
+        libssl-dev \
+        lsb-release \
+        openssh-server \
+        patchelf && \
     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 && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" cmake.sh
+RUN 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/*
-
+    rm ./cmake.sh 
+
 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"]
+ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]

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

@@ -5,7 +5,7 @@
   ],
   "Git": {
     "URI": "https://github.com/bringauto/ba-logger.git",
-    "Revision": "v1.2.0"
+    "Revision": "v2.0.0"
   },
   "Build": {
     "CMake": {
@@ -19,7 +19,7 @@
   },
   "Package": {
     "Name": "ba-logger",
-    "VersionTag": "v1.2.0",
+    "VersionTag": "v2.0.0",
     "PlatformString": {
       "Mode": "auto"
     },
@@ -29,12 +29,10 @@
   },
   "DockerMatrix": {
     "ImageNames": [
-      "ubuntu2004",
-      "debian11",
       "ubuntu2204",
       "debian12",
-      "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2404",
+      "fedora40"
     ]
   }
 }

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

@@ -5,7 +5,7 @@
   ],
   "Git": {
     "URI": "https://github.com/bringauto/ba-logger.git",
-    "Revision": "v1.2.0"
+    "Revision": "v2.0.0"
   },
   "Build": {
     "CMake": {
@@ -19,7 +19,7 @@
   },
   "Package": {
     "Name": "ba-logger",
-    "VersionTag": "v1.2.0",
+    "VersionTag": "v2.0.0",
     "PlatformString": {
       "Mode": "auto"
     },
@@ -29,12 +29,10 @@
   },
   "DockerMatrix": {
     "ImageNames": [
-      "ubuntu2004",
-      "debian11",
       "ubuntu2204",
       "debian12",
-      "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2404",
+      "fedora40"
     ]
   }
 }

example/package/boost/boost_debug.json

@@ -9,13 +9,13 @@
     "CMake": {
       "Defines": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "BOOST_VERSION": "1.78.0"
+        "BOOST_VERSION": "1.86.0"
       }
     }
   },
   "Package": {
     "Name": "boost",
-    "VersionTag": "v1.78.0",
+    "VersionTag": "v1.86.0",
     "PlatformString": {
       "Mode": "auto"
     },
@@ -25,13 +25,11 @@
   },
   "DockerMatrix": {
     "ImageNames": [
-      "ubuntu2004",
       "ubuntu2204",
       "fleet-os-2",
-      "debian11",
       "debian12",
-      "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2404",
+      "fedora40"
     ]
   }
 }

example/package/boost/boost_release.json

@@ -9,13 +9,13 @@
     "CMake": {
       "Defines": {
         "CMAKE_BUILD_TYPE": "Release",
-        "BOOST_VERSION": "1.78.0"
+        "BOOST_VERSION": "1.86.0"
       }
     }
   },
   "Package": {
     "Name": "boost",
-    "VersionTag": "v1.78.0",
+    "VersionTag": "v1.86.0",
     "PlatformString": {
       "Mode": "auto"
     },
@@ -25,13 +25,11 @@
   },
   "DockerMatrix": {
     "ImageNames": [
-      "ubuntu2004",
       "ubuntu2204",
       "fleet-os-2",
-      "debian11",
       "debian12",
-      "ubuntu2304",
-      "ubuntu2310"
+      "ubuntu2404",
+      "fedora40"
     ]
   }
 }