adopt focal builder; drop redhat7 and ubuntu bionic cpack builds; ubu…

…ntu install noble build if unknown codename

.github/actions/openziti-tunnel-build-action/README.md

@@ -15,13 +15,6 @@
           - name: ubuntu
             version: "20.04"
             type: deb
-          - name: ubuntu
-            version: "18.04"
-            type: deb
-          - name: redhat
-            version: "7"
-            type: rpm
-            container: docker.io/library/centos:7
           - name: redhat
             version: "8"
             type: rpm

.github/actions/openziti-tunnel-build-action/ubuntu-18.04/Dockerfile → .github/actions/openziti-tunnel-build-action/ubuntu-24.04/Dockerfile

@@ -1,9 +1,11 @@
 ARG CMAKE_VERSION="3.26.3"
+ARG VCPKG_VERSION="2024.01.12"
 
-# Ubuntu Bionic 18.04 LTS
-FROM ubuntu:bionic
+# Ubuntu Noble 24.04 LTS
+FROM ubuntu:noble
 
 ARG CMAKE_VERSION
+ARG VCPKG_VERSION
 
 LABEL org.opencontainers.image.authors="[email protected]"
 
@@ -14,13 +16,14 @@ ENV TZ=UTC
 USER root
 WORKDIR /root/
 
-ENV PATH="/usr/local/:${PATH}"
-
 RUN apt-get update \
     && apt-get -y install \
-        build-essential \
-        crossbuild-essential-armhf \
+        gcc-arm-linux-gnueabihf \
+        g++-arm-linux-gnueabihf \
+        gcc-aarch64-linux-gnu \
         crossbuild-essential-arm64 \
+        crossbuild-essential-armhf \
+        build-essential \
         curl zip unzip tar \
         doxygen \
         git \
@@ -33,30 +36,29 @@ RUN apt-get update \
         ninja-build \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl -sSfL https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}-linux-$(uname -m).sh -o cmake.sh \
-    && (bash cmake.sh --skip-license --prefix=/usr/local) \
-    && rm cmake.sh
-
-RUN dpkg --add-architecture armhf
-RUN dpkg --add-architecture arm64
 COPY ./crossbuild.list /etc/apt/sources.list.d/crossbuild.list
 RUN sed -Ei 's/^deb/deb [arch=amd64]/g' /etc/apt/sources.list
-RUN apt-get update
-RUN apt-get -y install \
-    zlib1g-dev:armhf \
-    zlib1g-dev:arm64 \
-    libssl-dev:armhf \
-    libssl-dev:arm64
+RUN dpkg --add-architecture arm64 && dpkg --add-architecture armhf
+RUN apt-get update \
+    && apt-get -y install \
+        libssl-dev:arm64 \
+        libssl-dev:armhf \
+        zlib1g-dev:arm64 \
+        zlib1g-dev:armhf \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sSfL "https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}-linux-$(uname -m).sh" -o cmake.sh \
+    && (bash cmake.sh --skip-license --prefix=/usr/local) \
+    && rm cmake.sh
 
 ENV VCPKG_ROOT=/usr/local/vcpkg
 # this must be set on arm. see https://learn.microsoft.com/en-us/vcpkg/users/config-environment#vcpkg_force_system_binaries
 ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
 
 RUN cd /usr/local \
     && git config --global advice.detachedHead false \
-    && git clone --branch 2023.12.12 https://github.com/microsoft/vcpkg \
+    && git clone --branch "${VCPKG_VERSION}" https://github.com/microsoft/vcpkg \
     && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
-WORKDIR /github/workspace
 COPY ./entrypoint.sh /root/
-ENTRYPOINT [ "/root/entrypoint.sh" ]
+ENTRYPOINT [ "/root/entrypoint.sh" ]

.github/actions/openziti-tunnel-build-action/ubuntu-24.04/crossbuild.list

@@ -0,0 +1,7 @@
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble main restricted
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble-updates main restricted
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble universe
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble-updates universe
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble multiverse
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble-updates multiverse
+deb [arch=arm64,armhf] http://ports.ubuntu.com/ noble-backports main restricted universe multiverse

.github/actions/openziti-tunnel-build-action/ubuntu-16.04/entrypoint.sh → .github/actions/openziti-tunnel-build-action/ubuntu-24.04/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Ubuntu Xenial 16.04
+# Debian Bookworm/Ubuntu Noble 24.04
 #
 
 set -euo pipefail
@@ -39,14 +39,13 @@ done
 [[ -d ./build ]] && rm -r ./build
 cmake \
     -E make_directory \
-    ./build
+    ./build  
 cmake \
     --preset "${cmake_preset}" \
     -DCMAKE_BUILD_TYPE="${cmake_config}" \
     -DBUILD_DIST_PACKAGES=ON \
-    -DDISABLE_LIBSYSTEMD_FEATURE=ON \
-    -DVCPKG_OVERLAY_PORTS="./vcpkg-overlays/linux-syslibs/ubuntu16" \
-    -S . \
+    "${TLSUV_TLSLIB:+-DTLSUV_TLSLIB=${TLSUV_TLSLIB}}" \
+    -S "${PWD}/" \
     -B ./build
 cmake \
     --build ./build \