build packages with cmake presets and vcpkg

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

@@ -27,18 +27,20 @@
             type: rpm
             container: docker.io/library/rockylinux:8
 
+    steps:
       - name: configure build action for distro version
         env:
-          DISTRO_LABEL: ${{ format('{0}:{1}', matrix.distro.name, matrix.distro.version) }}
+          DISTRO_LABEL: ${{ format('{0}-{1}', matrix.distro.name, matrix.distro.version) }}
         shell: bash
         run: |
-          for FILE in Dockerfile entrypoint.sh; do
-            mv -v ./.github/actions/openziti-tunnel-build-action/${FILE}.${DISTRO_LABEL} \
-                  ./.github/actions/openziti-tunnel-build-action/${FILE}
-          done
+          mv -v ./.github/actions/openziti-tunnel-build-action/${DISTRO_LABEL}/* ./.github/actions/openziti-tunnel-build-action/
 
-      - name: build cmake target "package"
+      # entrypoint.sh uses the value of arch to select the cmake preset
+      - name: build binary and package
         uses: ./.github/actions/openziti-tunnel-build-action
+        with:
+          arch: ${{ matrix.arch.cmake }}
+          config: Release
 
       - name: run binary artifact
         run: |

.github/actions/openziti-tunnel-build-action/action.yml

@@ -3,10 +3,14 @@ description: 'Builds ziti-edge-tunnel binary and install package for Linux'
 author: 'NetFoundry'
 inputs:
   arch:
-    description: 'The architecture string used by entrypoint.sh to select CMAKE_TOOLCHAIN_FILE'
+    description: 'The cmake preset used by entrypoint.sh when running cmake'
+    required: false
+  config:
+    description: 'The cmake build configuration used by entrypoint.sh when running cmake'
     required: false
 runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
     - ${{ inputs.arch }}
+    - ${{ inputs.config }}

.github/actions/openziti-tunnel-build-action/redhat-7/Dockerfile

@@ -1,4 +1,4 @@
-ARG CMAKE_VERSION="3.22.3"
+ARG CMAKE_VERSION="3.26.3"
 
 FROM docker.io/library/centos:7
 
@@ -20,14 +20,27 @@ RUN yum -y install \
         graphviz \
         python3 \
         zlib-devel \
+        epel-release \
     &&  yum -y install \
         devtoolset-11 \
         devtoolset-11-libatomic-devel \
+        ninja-build \
     &&  yum clean all
 
+# needed only to build openssl. we can't use openssl from rocky's repos because it is too old.
+RUN yum install -y perl-IPC-Cmd
+
 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 clone --branch 2023.04.15 https://github.com/microsoft/vcpkg \
+    && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
 COPY ./entrypoint.sh /root/
 ENTRYPOINT [ "/root/entrypoint.sh" ]

.github/actions/openziti-tunnel-build-action/redhat-7/entrypoint.sh

@@ -10,23 +10,18 @@ echo "INFO: GIT_DISCOVERY_ACROSS_FILESYSTEM=${GIT_DISCOVERY_ACROSS_FILESYSTEM}"
 echo "INFO: WORKDIR=${PWD}"
 echo "INFO: $(git --version)"
 
-# if first positional is an expected arch string then set toolchain file, else default toolchain
-if (( ${#} )); then
-    case ${1} in
-        amd64)  CMAKE_TOOLCHAIN_FILE="default.cmake"
-                shift
-        ;;
-        arm64)  CMAKE_TOOLCHAIN_FILE="Linux-arm64.cmake"
-                shift
-        ;;
-        arm)    CMAKE_TOOLCHAIN_FILE="Linux-arm.cmake"
-                shift
-        ;;
-        *)      CMAKE_TOOLCHAIN_FILE="default.cmake"
-        ;;
-    esac
+# if first positional is an expected arch string then set cmake preset,
+# else use ci-linux-x64 (which actually just uses native/host tools - e.g. not cross compile)
+if [ -n "${1}" ]; then
+    cmake_preset="${1}"
 else
-    CMAKE_TOOLCHAIN_FILE="default.cmake"
+    cmake_preset="ci-linux-x64"
+fi
+
+if [ -n "${2}" ]; then
+    cmake_config="${2}"
+else
+    cmake_config="Release"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.
@@ -49,21 +44,17 @@ cmake -E make_directory ./build
     set +u
     source scl_source enable devtoolset-11 \
         && cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_TOOLCHAIN_FILE=./toolchains/${CMAKE_TOOLCHAIN_FILE} \
+            --preset "${cmake_preset}" \
+            -DCMAKE_BUILD_TYPE="${cmake_config}" \
             -DBUILD_DIST_PACKAGES=ON \
             -DDISABLE_LIBSYSTEMD_FEATURE=ON \
+            -DVCPKG_OVERLAY_PORTS="./vcpkg-overlays/linux-syslibs/redhat7" \
             -S . \
             -B ./build
     source scl_source enable devtoolset-11 \
         && cmake \
             --build ./build \
+            --config "${cmake_config}" \
             --target package \
             --verbose
 )
-
-if (( ${#} )); then
-    echo "INFO: running ziti-edge-tunnel"
-    set -x
-    ./build/programs/ziti-edge-tunnel/ziti-edge-tunnel ${@}
-fi

.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile

@@ -1,4 +1,4 @@
-ARG CMAKE_VERSION="3.22.3"
+ARG CMAKE_VERSION="3.26.3"
 
 FROM rockylinux:8
 
@@ -30,12 +30,21 @@ RUN dnf install -y \
         doxygen \
         graphviz \
         git \
+        ninja-build \
     && dnf clean all 
 
 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 clone --branch 2023.04.15 https://github.com/microsoft/vcpkg \
+    && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
 WORKDIR /github/workspace
 COPY ./entrypoint.sh /root/
 ENTRYPOINT [ "/root/entrypoint.sh" ]

.github/actions/openziti-tunnel-build-action/redhat-8/entrypoint.sh

@@ -10,23 +10,18 @@ echo "INFO: GIT_DISCOVERY_ACROSS_FILESYSTEM=${GIT_DISCOVERY_ACROSS_FILESYSTEM}"
 echo "INFO: WORKDIR=${PWD}"
 echo "INFO: $(git --version)"
 
-# if first positional is an expected arch string then set toolchain file, else default toolchain
-if (( ${#} )); then
-    case ${1} in
-        amd64)  CMAKE_TOOLCHAIN_FILE="default.cmake"
-                shift
-        ;;
-        arm64)  CMAKE_TOOLCHAIN_FILE="Linux-arm64.cmake"
-                shift
-        ;;
-        arm)    CMAKE_TOOLCHAIN_FILE="Linux-arm.cmake"
-                shift
-        ;;
-        *)      CMAKE_TOOLCHAIN_FILE="default.cmake"
-        ;;
-    esac
+# if first positional is an expected arch string then set cmake preset,
+# else use ci-linux-x64 (which actually just uses native/host tools - e.g. not cross compile)
+if [ ${#} -ge 1 ]; then
+    cmake_preset="${1}"
 else
-    CMAKE_TOOLCHAIN_FILE="default.cmake"
+    cmake_preset="ci-linux-x64"
+fi
+
+if [ ${#} -ge 2 ]; then
+    cmake_config="${2}"
+else
+    cmake_config="Release"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.
@@ -49,21 +44,16 @@ cmake -E make_directory ./build
     set +u
     source scl_source enable gcc-toolset-10 \
         && cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_TOOLCHAIN_FILE=./toolchains/${CMAKE_TOOLCHAIN_FILE} \
+            --preset "${cmake_preset}" \
+            -DCMAKE_BUILD_TYPE="${cmake_config}" \
             -DBUILD_DIST_PACKAGES=ON \
             -DUSE_OPENSSL=ON \
             -S . \
             -B ./build 
     source scl_source enable gcc-toolset-10 \
         && cmake \
             --build ./build \
+            --config "${cmake_config}" \
             --target package \
             --verbose
 )
-
-if (( ${#} )); then
-    echo "INFO: running ziti-edge-tunnel"
-    set -x
-    ./build/programs/ziti-edge-tunnel/ziti-edge-tunnel ${@}
-fi

.github/actions/openziti-tunnel-build-action/ubuntu-14.04/Dockerfile

@@ -1,4 +1,4 @@
-ARG CMAKE_VERSION="3.22.3"
+ARG CMAKE_VERSION="3.26.3"
 
 FROM ubuntu:trusty
 
@@ -19,14 +19,17 @@ RUN apt-get -y update \
     && apt-get -y install \
         build-essential \
         curl \
+        zip \
+        unzip \
+        tar \
         doxygen \
         git \
         graphviz \
-        iproute2 \
         pkg-config \
         python3 \
         software-properties-common \
         zlib1g-dev \
+        ninja-build \
     && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
     && apt-get -y update \
     && apt-get -y install \
@@ -43,6 +46,15 @@ RUN curl -sSfL https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSIO
     && (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.04.15 https://github.com/microsoft/vcpkg \
+    && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
 WORKDIR /github/workspace
 COPY ./entrypoint.sh /root/
 ENTRYPOINT [ "/root/entrypoint.sh" ]

.github/actions/openziti-tunnel-build-action/ubuntu-14.04/entrypoint.sh

@@ -10,23 +10,18 @@ echo "INFO: GIT_DISCOVERY_ACROSS_FILESYSTEM=${GIT_DISCOVERY_ACROSS_FILESYSTEM}"
 echo "INFO: WORKDIR=${PWD}"
 echo "INFO: $(git --version)"
 
-# if first positional is an expected arch string then set toolchain file, else default toolchain
-if (( ${#} )); then
-    case ${1} in
-        amd64)  CMAKE_TOOLCHAIN_FILE="default.cmake"
-                shift
-        ;;
-        arm64)  CMAKE_TOOLCHAIN_FILE="Linux-arm64.cmake"
-                shift
-        ;;
-        arm)    CMAKE_TOOLCHAIN_FILE="Linux-arm.cmake"
-                shift
-        ;;
-        *)      CMAKE_TOOLCHAIN_FILE="default.cmake"
-        ;;
-    esac
+# if first positional is an expected arch string then set cmake preset,
+# else use ci-linux-x64 (which actually just uses native/host tools - e.g. not cross compile)
+if [ -n "${1}" ]; then
+    cmake_preset="${1}"
 else
-    CMAKE_TOOLCHAIN_FILE="default.cmake"
+    cmake_preset="ci-linux-x64"
+fi
+
+if [ -n "${2}" ]; then
+    cmake_config="${2}"
+else
+    cmake_config="Release"
 fi
 
 # workspace dir for each build env is added to "safe" dirs in global config e.g.
@@ -44,19 +39,15 @@ done
 [[ -d ./build ]] && rm -r ./build
 cmake -E make_directory ./build  
 cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_TOOLCHAIN_FILE=./toolchains/${CMAKE_TOOLCHAIN_FILE} \
+    --preset "${cmake_preset}" \
+    -DCMAKE_BUILD_TYPE="${cmake_config}" \
     -DBUILD_DIST_PACKAGES=ON \
     -DDISABLE_LIBSYSTEMD_FEATURE=ON \
+    -DVCPKG_OVERLAY_PORTS="./vcpkg-overlays/linux-syslibs/ubuntu14" \
     -S . \
     -B ./build 
 cmake \
     --build ./build \
+    --config "${cmake_config}" \
     --target package \
     --verbose
-
-if (( ${#} )); then
-    echo "INFO: running ziti-edge-tunnel"
-    set -x
-    ./build/programs/ziti-edge-tunnel/ziti-edge-tunnel ${@}
-fi

.github/actions/openziti-tunnel-build-action/ubuntu-16.04/Dockerfile

@@ -1,4 +1,4 @@
-ARG CMAKE_VERSION="3.22.3"
+ARG CMAKE_VERSION="3.26.3"
 
 FROM ubuntu:xenial
 
@@ -19,19 +19,31 @@ RUN apt-get -y update \
     && apt-get -y install \
         build-essential \
         curl \
+        zip \
+        unzip \
+        tar \
         doxygen \
         git \
         graphviz \
-        iproute2 \
         pkg-config \
         python3 \
         zlib1g-dev \
+        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
 
+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.04.15 https://github.com/microsoft/vcpkg \
+    && ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
+
 WORKDIR /github/workspace
 COPY ./entrypoint.sh /root/
 ENTRYPOINT [ "/root/entrypoint.sh" ]