Azure · MariusNi · Nov 15, 2025
@@ -9,3 +9,24 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get -y instal
     rapidjson-dev \
     uuid-dev \
     wget
+
+ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.31.8"
+
+# Optionally install the cmake for vcpkg
+COPY ./reinstall-cmake.sh /tmp/
+
+RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
+        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
+    fi \
+    && rm -f /tmp/reinstall-cmake.sh
+
+# Install vcpkg
+RUN git clone https://github.com/microsoft/vcpkg.git --branch ${VCPKG_REF} --single-branch /vcpkg
+COPY ./vcpkg.json /vcpkg/
+COPY ./vcpkg-configuration.json /vcpkg/
+WORKDIR /vcpkg
+RUN ./bootstrap-vcpkg.sh && ./vcpkg install && ./vcpkg integrate install
+ENV VCPKG_ROOT /vcpkg
+
+# Base container pre-defines VCPKG_ROOT in /etc/bash.bashrc
+sed -i '/VCPKG_ROOT/d' /etc/bash.bashrc
@@ -21,5 +21,6 @@
 			]
 		}
 	},
+	"containerEnv": { "VCPKG_ROOT": "/vcpkg" },
 	"remoteUser": "root"
 }
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+set -e
+
+CMAKE_VERSION=${1:-"none"}
+
+if [ "${CMAKE_VERSION}" = "none" ]; then
+    echo "No CMake version specified, skipping CMake reinstallation"
+    exit 0
+fi
+
+# Cleanup temporary directory and associated files when exiting the script.
+cleanup() {
+    EXIT_CODE=$?
+    set +e
+    if [[ -n "${TMP_DIR}" ]]; then
+        echo "Executing cleanup of tmp files"
+        rm -Rf "${TMP_DIR}"
+    fi
+    exit $EXIT_CODE
+}
+trap cleanup EXIT
+
+
+echo "Installing CMake..."
+apt-get -y purge --auto-remove cmake
+mkdir -p /opt/cmake
+
+architecture=$(dpkg --print-architecture)
+case "${architecture}" in
+    arm64)
+        ARCH=aarch64 ;;
+    amd64)
+        ARCH=x86_64 ;;
+    *)
+        echo "Unsupported architecture ${architecture}."
+        exit 1
+        ;;
+esac
+
+CMAKE_BINARY_NAME="cmake-${CMAKE_VERSION}-linux-${ARCH}.sh"
+CMAKE_CHECKSUM_NAME="cmake-${CMAKE_VERSION}-SHA-256.txt"
+TMP_DIR=$(mktemp -d -t cmake-XXXXXXXXXX)
+
+echo "${TMP_DIR}"
+cd "${TMP_DIR}"
+
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_BINARY_NAME}" -O
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_CHECKSUM_NAME}" -O
+
+sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
+sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
+
+ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest
@@ -16,10 +16,6 @@ inputs:
     description: The container tag.
     required: false
     default: latest
-  args:
-    description: Additional arguments to pass to the container.
-    required: false
-    default: ""
 
 outputs:
   id:
@@ -53,7 +49,7 @@ runs:
           container_name_tag="${name}:${tag}"
         fi
         echo "Running container ${container_name_tag}"
-        id=$(docker run -di --privileged ${{ inputs.args }} -v ${{ inputs.mount }} "${container_name_tag}")
+        id=$(docker run -di --privileged -v ${{ inputs.mount }} "${container_name_tag}")
 
         echo Container ID: $id
         echo id=$id >> $GITHUB_OUTPUT
@@ -1,23 +1,20 @@
 [
-    {"name":"almalinux-9","arch":"amd64","tag":"@sha256:457a85686d95bd324c1ddbdba43fccb79d8c127c11b1189941ccc913989461c5"},
-    {"name":"amazonlinux-2","arch":"amd64","tag":"@sha256:5f78d184712b39087d4448d1fe04ffa6a4dbb6e5ff0e29cdef0eff1f3980cfd8"},
-    {"name":"azurelinux-3","arch":"amd64","tag":"@sha256:6d8d1134816ee789c5579570d83671cd572ac0634a1ffdc04a0ef5471f8b0877"},
-    {"name":"centos-7","arch":"amd64","tag":"@sha256:0e72fef7615ffd41db07a0cb4a2d989f74925bc49a546c719f7ccb857852108a"},
-    {"name":"centos-8","arch":"amd64","tag":"@sha256:2fb02a9f8259b91ea938c003a845b7e9dc7150ea643bf8c1b6ae8bd4087d8706"},
-    {"name":"debian-10","arch":"amd64","tag":"@sha256:a05ae3e90f16cd284e3c0c818420c2685c17f327c0e6a1967837573490a2a327"},
-    {"name":"debian-11","arch":"amd64","tag":"@sha256:368dac89e858472de6435c86905c26749eb42e4a944b177b0df5c2dcb741b693"},
-    {"name":"debian-12","arch":"amd64","tag":"@sha256:63a8712390f4aed657924706ed0c4ce1c37d4c5d5c189625a09785e00fceac62"},
-    {"name":"debian-9","arch":"amd64","tag":"@sha256:7665a7e37457e59e3d240219230cf2a030aa9fe1a00e08a92b144ba8c383419e"},
-    {"name":"mariner-2","arch":"amd64","tag":"@sha256:7080c3c0e03bf530e09ac94ae7f486e005534706cebe4df623f71de49d0f2904"},
-    {"name":"oraclelinux-7","arch":"amd64","tag":"@sha256:0561e7c5d0ae0486450ad086bf3e25a69be721e52df1df63bd835972322fb1e4"},
-    {"name":"oraclelinux-8","arch":"amd64","tag":"@sha256:1bf1d1622e5163d02c2066b15bd18294bf301a1df1d60318d7a396fc0e795b66"},
-    {"name":"rhel-7","arch":"amd64","tag":"@sha256:5739b3749eea6af70f6a76ce092e9a3b1b2f8f8ed1b6002bade36c28e74426c4"},
-    {"name":"rhel-8","arch":"amd64","tag":"@sha256:fd4b3005958abe0c8a3f9aee3be3604c9a778de80e89dd9d62b3c0864a701383"},
-    {"name":"rhel-9","arch":"amd64","tag":"@sha256:7cfb079ea2887a9cc8a524f109873126a76684076bec13bbd87e139d8d053b78"},
-    {"name":"rockylinux-9","arch":"amd64","tag":"@sha256:93c24f671cd27cfbf92a25177fbaa43fdf4a1da4911794ce771cb44bad096604"},
-    {"name":"sles-15","arch":"amd64","tag":"@sha256:b633a6effbe084b5cf34f1e10995374feb61b0a366160c5e7a786237aeb877a8"},
-    {"name":"ubuntu-18.04","arch":"amd64","tag":"@sha256:d0bf753624703349ad20886de2b7795caf46db005d5a5ece633aaa5aec7505f9"},
-    {"name":"ubuntu-20.04","arch":"amd64","tag":"@sha256:31687451ce1b8f50f4f26884bd0947fb5d5dba8711c63601b14bc0b19cb5c6ca"},
-    {"name":"ubuntu-22.04","arch":"amd64","tag":"@sha256:de2c11da255fa2c0ec39c9f56a53aaefbb4db97982e11c9487116551fc4ecae0"},
-    {"name":"ubuntu-24.04","arch":"amd64","tag":"@sha256:f660171fcbb5ef1669303456c85b7a0f9fba447c2e35ae89953f9070200f5c15"}
+    { "name": "almalinux-9", "arch": "amd64", "tag": "@sha256:d2c6bd9f0eda3151c38f5c678b25124af1d34622de5757e690fe518ab613aec3" },
+    { "name": "amazonlinux-2", "arch": "amd64", "tag": "@sha256:651fcca7123d696d883d5e755723ae018dadb35284fd5d3ab29008b21e858bf6" },
+    { "name": "azurelinux-3", "arch": "amd64", "tag": "@sha256:029c9096b62a553eee7a6621eee36d77002effe3a2d7b8c9b7e8d59c49697cd3" },
+    { "name": "centos-7", "arch": "amd64", "tag": "@sha256:fca7046aa164e1cd5e8521bbd40dcf1f714fd8ee8a73e2d2d401ef459e3d6100" },
+    { "name": "centos-8", "arch": "amd64", "tag": "@sha256:3ed4e39b0524bc41b327c0aa4c3899f55febfc638d66668e4a6b5c175df892ee" },
+    { "name": "debian-10", "arch": "amd64", "tag": "@sha256:f35850f7627c3404c6a3a11443505ce6b80b9b6b437cd19ca67452ab4b77a2d4" },
+    { "name": "debian-11", "arch": "amd64", "tag": "@sha256:97c518527c76ad997bab15559d3640e7d2bf27eeab5eedc501546364e1dec311" },
+    { "name": "debian-12", "arch": "amd64", "tag": "@sha256:05a41d7ae8b496fa956965e93ad5217633604db00851e8dfabfe7981513c2c7d" },
+    { "name": "mariner-2", "arch": "amd64", "tag": "@sha256:7ac04b9368533f71127b977439f4b3a1576a1be3ec1fe444acf1216032c4ae2b" },
+    { "name": "oraclelinux-7", "arch": "amd64", "tag": "@sha256:77b4c9913d01397c540dd831e80aebf57fd4cdc48d5a6fcd652128db94718f0b" },
+    { "name": "oraclelinux-8", "arch": "amd64", "tag": "@sha256:2c05af2c8bea2b85108e85f0489f65d21df489f7addcb56ced1fc75bb4ce0897" },
+    { "name": "rhel-7", "arch": "amd64", "tag": "@sha256:35fc1d2dd889c6225acc000dde3d819417b68fec80e3f66a0768c0dbaf1ab490" },
+    { "name": "rhel-8", "arch": "amd64", "tag": "@sha256:36aa8a92ceea75f3408515b464d659ee129a30185a2abbbb2b52b1d7323ef422" },
+    { "name": "rhel-9", "arch": "amd64", "tag": "@sha256:b4b0dec958fb4e5eab499fd1cc5310bf8eb3b5ca316e0ff563bffd119ae136a5" },
+    { "name": "sles-15", "arch": "amd64", "tag": "@sha256:5dda8a77136f34be84cca6735872bf0ef5b2f34d41df8bb9317ec08317bcc559" },
+    { "name": "ubuntu-20.04", "arch": "amd64", "tag": "@sha256:d880441d800f0b5d9acece95c2a87ae0cbb9f2f35983024fd82d7e476840c33f" },
+    { "name": "ubuntu-22.04", "arch": "amd64", "tag": "@sha256:1398461e6a1f38940f10bf153ea0ea51e2a77d03de3d10e47aa9a1bb985b795f" },
+    { "name": "ubuntu-24.04", "arch": "amd64", "tag": "@sha256:ecf8fcb26175d413716d0a40b043e5d9685b9b2b895de590313ef6da7318bb6b" }
 ]
@@ -23,7 +23,7 @@ jobs:
         run: |
           matrix="$(cat <<'EOL'
           [
-            { "name": "ubuntu-22.04", "arch": "amd64", "tag": "@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6" }
+            { "name": "ubuntu-22.04", "arch": "amd64", "tag": "latest" }
           ]
           EOL
           )"

@@ -23,7 +23,7 @@ jobs:
         run: |
           matrix="$(cat <<'EOL'
           [
-            { "name": "ubuntu-22.04", "arch": "amd64", "tag": "@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6" }
+            { "name": "ubuntu-22.04", "arch": "amd64", "tag": "latest" }
           ]
           EOL
           )"

@@ -70,11 +70,7 @@ jobs:
           cmd: |
             (cd external/vcpkg && sed -e "s/\"2\\.7\\.4\"/\"1\\.0\\.0\"/g" -i scripts/vcpkg-tools.json && ./bootstrap-vcpkg.sh)
             mkdir build && cd build
-            if [ "${{ matrix.target.name }}" = "ubuntu-14.04" ]; then
-              cmake ../src -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=ON -DBUILD_SAMPLES=ON -DBUILD_ADAPTERS=ON -Duse_default_uuid=ON -DVCPKG_OVERLAY_TRIPLETS=../src/triplets -DVCPKG_TARGET_TRIPLET=x64-linux-gcc5
-            else
-              cmake ../src -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=ON -DBUILD_SAMPLES=ON -DBUILD_ADAPTERS=ON -Duse_default_uuid=ON
-            fi
+            cmake ../src -DCMAKE_build-type=${{ env.BUILD_TYPE }} -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=ON -DBUILD_SAMPLES=ON -DBUILD_ADAPTERS=ON -Duse_default_uuid=ON
 
       - name: Build azure-osconfig
         uses: ./.github/actions/container-exec

@@ -39,7 +39,6 @@ jobs:
       artifact: ${{ inputs.target }}-fuzzer
       package-type: ${{ inputs.package-type }}
       build-fuzzers: true
-      container-tag: ${{ inputs.container-tag }}
 
   fuzzer-execution:
     if: ${{ inputs.execute }}

@@ -15,7 +15,7 @@ jobs:
       matrix:
         target:
           [
-            { os: ubuntu, version: 22.04, package-type: DEB, container-tag: '@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6' },
+            { os: ubuntu, version: 22.04, package-type: DEB },
           ]
         arch: [amd64]
     with:
@@ -24,4 +24,3 @@ jobs:
       package-type: ${{ matrix.target.package-type }}
       timeout-seconds: 3600
       execute: ${{ contains(fromJSON('["workflow_dispatch", "schedule"]'), github.event_name) }}
-      container-tag: ${{ matrix.target.container-tag }}
@@ -12,9 +12,6 @@ on:
       package-type:
         required: true
         type: string
-      container-tag:
-        type: string
-        required: false
       excluded-tests:
         required: false
         description: 'A regex pattern of tests to exclude.'
@@ -28,7 +25,6 @@ jobs:
       arch: ${{ inputs.arch }}
       artifact: ${{ inputs.target }}
       package-type: ${{ inputs.package-type }}
-      container-tag: ${{ inputs.container-tag }}
       test: true
 
   test:

@@ -15,22 +15,21 @@ jobs:
       matrix:
         target:
           [
-            { os: almalinux, version: 9, package-type: RPM, container-tag: "@sha256:457a85686d95bd324c1ddbdba43fccb79d8c127c11b1189941ccc913989461c5" },
-            { os: azurelinux, version: 3, package-type: RPM, container-tag: "@sha256:6d8d1134816ee789c5579570d83671cd572ac0634a1ffdc04a0ef5471f8b0877" },
-            { os: debian, version: 11, package-type: DEB, container-tag: "@sha256:368dac89e858472de6435c86905c26749eb42e4a944b177b0df5c2dcb741b693" },
-            { os: debian, version: 12, package-type: DEB, container-tag: "@sha256:63a8712390f4aed657924706ed0c4ce1c37d4c5d5c189625a09785e00fceac62" },
-            { os: oraclelinux, version: 8, package-type: RPM, container-tag: "@sha256:1bf1d1622e5163d02c2066b15bd18294bf301a1df1d60318d7a396fc0e795b66" },
-            { os: rhel, version: 8, package-type: RPM, container-tag: "@sha256:fd4b3005958abe0c8a3f9aee3be3604c9a778de80e89dd9d62b3c0864a701383" },
-            { os: rhel, version: 9, package-type: RPM, container-tag: "@sha256:7cfb079ea2887a9cc8a524f109873126a76684076bec13bbd87e139d8d053b78" },
-            { os: sles, version: 15, package-type: RPM, container-tag: "@sha256:b633a6effbe084b5cf34f1e10995374feb61b0a366160c5e7a786237aeb877a8" },
-            { os: ubuntu, version: 20.04, package-type: DEB, container-tag: "@sha256:31687451ce1b8f50f4f26884bd0947fb5d5dba8711c63601b14bc0b19cb5c6ca" },
-            { os: ubuntu, version: 22.04, package-type: DEB, container-tag: "@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6" },
-            { os: ubuntu, version: 24.04, package-type: DEB, container-tag: "@sha256:f660171fcbb5ef1669303456c85b7a0f9fba447c2e35ae89953f9070200f5c15" },
+            { os: almalinux, version: 9, package-type: RPM },
+            { os: azurelinux, version: 3, package-type: RPM },
+            { os: debian, version: 11, package-type: DEB },
+            { os: debian, version: 12, package-type: DEB },
+            { os: oraclelinux, version: 8, package-type: RPM },
+            { os: rhel, version: 8, package-type: RPM },
+            { os: rhel, version: 9, package-type: RPM },
+            { os: sles, version: 15, package-type: RPM },
+            { os: ubuntu, version: 20.04, package-type: DEB },
+            { os: ubuntu, version: 22.04, package-type: DEB },
+            { os: ubuntu, version: 24.04, package-type: DEB },
           ]
         arch: [amd64]
     with:
       target: ${{ matrix.target.os }}-${{ matrix.target.version }}
       arch: ${{ matrix.arch }}
       package-type: ${{ matrix.target.package-type }}
       excluded-tests: ${{ matrix.target.excluded-tests }}
-      container-tag: ${{ matrix.target.container-tag }}
@@ -11,19 +11,11 @@ jobs:
       matrix:
         target:
           [
-            { os: ubuntu, version: 14.04, arch: amd64, dist: trusty, package-type: DEB, tag: "@sha256:d6f9c8072541d23779b0fbd4ff53d7b55dbdcf5d8998aa44a790546d9ec1e747" },
+            { os: ubuntu, version: 14.04, arch: amd64, dist: trusty, package-type: DEB },
           ]
-    secrets:
-      onedstenant: >-
-        ${{
-          (github.ref == 'refs/heads/main' && secrets.ONEDS_TENANT_PROD) ||
-          (github.ref == 'refs/heads/dev' && secrets.ONEDS_TENANT_NONPROD) ||
-          ''
-        }}
     with:
       target: ${{ matrix.target.os }}-${{ matrix.target.version }}
       arch: ${{ matrix.target.arch }}
-      container-tag: ${{ matrix.target.tag }}
       artifact: policy-packages
       machine-config: true
       release: true
@@ -2,9 +2,6 @@ name: Build Azure OSConfig Package
 
 on:
   workflow_call:
-    secrets:
-      onedstenant:
-        required: false
     inputs:
       artifact:
         description: The artifact name containing the packages from this workflow.
@@ -81,7 +78,6 @@ jobs:
           container: azure/azure-osconfig/${{ inputs.target }}-${{ inputs.arch }}
           mount: ${{ github.workspace }}:${{ env.MOUNT }}
           tag: ${{ inputs.container-tag }}
-          args: -e OsConfigTelemetryApiKey=${{ secrets.onedstenant }}
 
       - name: Set tweak
         id: version
@@ -107,7 +103,7 @@ jobs:
           cmd: |
             (cd ../external/vcpkg && sed -e "s/\"2\\.7\\.4\"/\"1\\.0\\.0\"/g" -i scripts/vcpkg-tools.json && ./bootstrap-vcpkg.sh)
             if [ "${{ inputs.machine-config }}" = "true" ]; then
-              cmake ../src -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DVCPKG_OVERLAY_TRIPLETS=../src/triplets -DVCPKG_TARGET_TRIPLET=x64-linux-gcc5
+              cmake ../src -DCMAKE_BUILD_TYPE='${{ env.BUILD_TYPE }}' -DBUILD_TESTS=OFF
             elif [ "${{ inputs.build-fuzzers }}" = "true" ]; then
               cmake ../src -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER='/usr/bin/clang' -DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DTWEAK_VERSION='${{ steps.version.outputs.tweak }}' -Duse_prov_client=ON -Dhsm_type_symm_key=ON -DCOMPILE_WITH_STRICTNESS=ON -DBUILD_TESTS=OFF -DBUILD_MODULETEST=OFF -DBUILD_SAMPLES=OFF -Duse_default_uuid=ON -DBUILD_ADAPTERS=ON -DBUILD_FUZZER=ON
             else

@@ -7,7 +7,7 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/azure/azure-osconfig/ubuntu-22.04-amd64@sha256:7ba3a3bd055c507c2a42ce71448c3ff71889a3b58a7656900baf23e1dac0ced6
+      image: ghcr.io/azure/azure-osconfig/ubuntu-22.04-amd64
 
     steps:
     - uses: actions/checkout@v4

@@ -23,23 +23,15 @@ jobs:
     if: ${{ inputs.policy_packages == '[]' || inputs.policy_packages == '' }}
     uses: ./.github/workflows/package-build.yml
     needs: [setup-matrix]
-    secrets:
-      onedstenant: >-
-        ${{
-          (github.ref == 'refs/heads/main' && secrets.ONEDS_TENANT_PROD) ||
-          (github.ref == 'refs/heads/dev' && secrets.ONEDS_TENANT_NONPROD) ||
-          (github.ref == 'refs/heads/ahbenmes/telemetry_staging' && secrets.ONEDS_TENANT_NONPROD) ||
-          ''
-        }}
     with:
       target: ubuntu-14.04
       arch: amd64
       artifact: nrp-test
       package-type: DEB
-      container-tag: "@sha256:d6f9c8072541d23779b0fbd4ff53d7b55dbdcf5d8998aa44a790546d9ec1e747"
       test: true
       machine-config: true
       release: ${{ github.event_name == 'pull_request' && false || true }}
+
   setup-matrix:
     name: Setup Matrix
     runs-on: ubuntu-latest
@@ -154,7 +146,7 @@ jobs:
 
   mc-test:
     name: MC Test
-    if: ${{ always() && needs.setup-matrix.result == 'success' && (needs.package.result == 'success' || needs.custom-download.result == 'success') }}
+    if: ${{ always() }}
     needs: [setup-matrix, package, custom-download]
     runs-on: [self-hosted, 1ES.Pool=ci-pool, '1ES.ImageOverride=${{ matrix.target.os }}-${{ matrix.target.version }}']
     strategy:
@@ -199,7 +191,7 @@ jobs:
         uses: ./.github/actions/check-size
         with:
           package: '${{ steps.normalize.outputs.path }}'
-          limit: 5000
+          limit: 350
 
       - name: Run Guest Configuration Test
         working-directory: ${{ steps.normalize.outputs.PolicyPackageDir }}
@@ -251,7 +243,6 @@ jobs:
         run: |
           mkdir  osconfig-logs
           stat /var/log/osconfig_nrp.log
-          sudo chown -R $USER:$(id -gn) /var/log/osconfig*
           sudo chmod 644 /var/log/osconfig*
           cp -r /var/log/osconfig* osconfig-logs/
 
@@ -387,7 +378,7 @@ jobs:
             sudo find . \( -name '*.log' -o -name '*.bak' \) -exec mv -t ../../logs/$base_dir -- {} +
             popd
           done
-          sudo chown -R $USER:$(id -gn) ./staging
+          sudo chown -R $USER:$USER ./staging
 
           echo "Listing reports:"
           find ./staging/reports -type f -print | xargs ls -l

@@ -1,4 +1,4 @@
-build*/
+build/
 .vscode
 out
 dist
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,5 +21,6 @@ @@
     			]
     		}
     	},
+    	"containerEnv": { "VCPKG_ROOT": "/vcpkg" },
     	"remoteUser": "root"
     }