Merge 3.0-dev into 3.0 for preview update (#9220)

.github/CODEOWNERS

@@ -87,6 +87,9 @@
 /toolkit/scripts/toolchain/cgmanifest.json @microsoft/cbl-mariner-admins
 /toolkit/scripts/toolchain/create_toolchain_in_container.sh @microsoft/cbl-mariner-admins
 
+# Modifications to the trusted CA certificates require admin approval.
+/SPECS/*ca-certificates*/* @microsoft/cbl-mariner-admins
+
 # Image Customizer
 /toolkit/tools/imagecustomizer/ @microsoft/cbl-mariner-imagecustomizer
 /toolkit/tools/imagecustomizerapi/ @microsoft/cbl-mariner-imagecustomizer

.pipelines/containerSourceData/busybox/busybox.name

@@ -0,0 +1 @@
+busybox

.pipelines/containerSourceData/cdi/api.name

@@ -0,0 +1 @@
+containerized-data-importer-api

.pipelines/containerSourceData/cdi/cloner.name

@@ -0,0 +1 @@
+containerized-data-importer-cloner

.pipelines/containerSourceData/cdi/controller.name

@@ -0,0 +1 @@
+containerized-data-importer-controller

.pipelines/containerSourceData/cdi/importer.name

@@ -0,0 +1 @@
+containerized-data-importer-importer

.pipelines/containerSourceData/cdi/operator.name

@@ -0,0 +1 @@
+containerized-data-importer-operator

.pipelines/containerSourceData/cdi/uploadproxy.name

@@ -0,0 +1 @@
+containerized-data-importer-uploadproxy

.pipelines/containerSourceData/cdi/uploadserver.name

@@ -0,0 +1 @@
+containerized-data-importer-uploadserver

.pipelines/containerSourceData/certmanager/acmesolver.name

@@ -0,0 +1 @@
+cert-manager-acmesolver

.pipelines/containerSourceData/certmanager/cainjector.name

@@ -0,0 +1 @@
+cert-manager-cainjector

.pipelines/containerSourceData/certmanager/cmctl.name

@@ -0,0 +1 @@
+cert-manager-cmctl

.pipelines/containerSourceData/certmanager/controller.name

@@ -0,0 +1 @@
+cert-manager-controller

.pipelines/containerSourceData/certmanager/webhook.name

@@ -0,0 +1 @@
+cert-manager-webhook

.pipelines/containerSourceData/influxdb/influxdb.name

@@ -0,0 +1 @@
+influxdb

.pipelines/containerSourceData/kubevirt/virt-api.name

@@ -0,0 +1 @@
+kubevirt-virt-api

.pipelines/containerSourceData/kubevirt/virt-controller.name

@@ -0,0 +1 @@
+kubevirt-virt-controller

.pipelines/containerSourceData/kubevirt/virt-handler.name

@@ -0,0 +1 @@
+kubevirt-virt-handler

.pipelines/containerSourceData/kubevirt/virt-launcher.name

@@ -0,0 +1 @@
+kubevirt-virt-launcher

.pipelines/containerSourceData/kubevirt/virt-operator.name

@@ -0,0 +1 @@
+kubevirt-virt-operator

.pipelines/containerSourceData/memcached/memcached.name

@@ -0,0 +1 @@
+memcached

.pipelines/containerSourceData/multus/multus.name

@@ -0,0 +1 @@
+multus

.pipelines/containerSourceData/nginx/nginx.name

@@ -0,0 +1 @@
+nginx

.pipelines/containerSourceData/nodejs/distroless/nodejs18.pkg → .pipelines/containerSourceData/nodejs/distroless/nodejs.pkg

@@ -1,3 +1,3 @@
 distroless-packages-base
-nodejs18
+nodejs
 prebuilt-ca-certificates

.pipelines/containerSourceData/nodejs/nodejs.name

@@ -0,0 +1 @@
+nodejs

.pipelines/containerSourceData/openmpi/openmpi.name

@@ -0,0 +1 @@
+openmpi

.pipelines/containerSourceData/php/php.name

@@ -0,0 +1 @@
+php

.pipelines/containerSourceData/postgres/postgres.name

@@ -0,0 +1 @@
+postgresql

.pipelines/containerSourceData/prometheus/prometheus.name

@@ -0,0 +1 @@
+prometheus

.pipelines/containerSourceData/prometheusadapter/prometheusadapter.name

@@ -0,0 +1 @@
+prometheus-adapter

.pipelines/containerSourceData/python/python.name

@@ -0,0 +1 @@
+python

.pipelines/containerSourceData/pytorch/pytorch.name

@@ -0,0 +1 @@
+python3-pytorch

.pipelines/containerSourceData/rabbitmqserver/rabbitmqserver.name

@@ -0,0 +1 @@
+rabbitmq-server

.pipelines/containerSourceData/ruby/ruby.name

@@ -0,0 +1 @@
+ruby

.pipelines/containerSourceData/rust/rust.name

@@ -0,0 +1 @@
+rust

.pipelines/containerSourceData/scripts/BuildGoldenContainer.sh

@@ -10,7 +10,7 @@ set -e
 # - b) ACR name (e.g. azurelinepreview, acrafoimages, etc.)
 # - c) Container repository name (e.g. base/nodejs, base/postgres, base/kubevirt/cdi-apiserver, etc.)
 # - d) Image name (e.g. nodejs, postgres, cdi, etc.)
-# - e) Component name (e.g. nodejs18, postgresql, containerized-data-importer-api, etc.)
+# - e) Component file name (e.g. nodejs.name, postgres.name, api.name, etc.)
 # - f) Package file name (e.g. nodejs18.pkg, postgres.pkg, api.pkg, etc.)
 # - g) Dockerfile name (e.g. Dockerfile-nodejs, Dockerfile-Postgres, Dockerfile-cdi-apiserver, etc.)
 # - h) Docker build arguments (e.g. '--build-arg BINARY_NAME="cdi-apiserver" --build-arg USER=1001')
@@ -38,10 +38,11 @@ set -e
 #   ~/azurelinux/.pipelines/containerSourceData
 #   ├── nodejs
 #   │   ├── distroless
-#   │   │   ├── holdback-nodejs18.pkg
-#   │   │   ├── nodejs18.pkg
+#   │   │   ├── holdback-nodejs.pkg
+#   │   │   ├── nodejs.pkg
 #   │   ├── Dockerfile-Nodejs
-#   │   ├── nodejs18.pkg
+#   │   ├── nodejs.pkg
+#   |   |── nodejs.name
 #   ├── configuration
 #   │   ├── acrRepoV2.json
 #   ├── scripts
@@ -62,7 +63,7 @@ while getopts ":a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:" OPTIONS; do
     b ) ACR=$OPTARG;;
     c ) REPOSITORY=$OPTARG;;
     d ) IMAGE=$OPTARG;;
-    e ) COMPONENT=$OPTARG;;
+    e ) COMPONENT_FILE=$OPTARG;;
     f ) PACKAGE_FILE=$OPTARG;;
     g ) DOCKERFILE=$OPTARG;;
     h ) DOCKER_BUILD_ARGS=$OPTARG;;
@@ -105,7 +106,7 @@ function print_inputs {
     echo "ACR                           -> $ACR"
     echo "REPOSITORY                    -> $REPOSITORY"
     echo "IMAGE                         -> $IMAGE"
-    echo "COMPONENT                     -> $COMPONENT"
+    echo "COMPONENT_FILE                -> $COMPONENT_FILE"
     echo "PACKAGE_FILE                  -> $PACKAGE_FILE"
     echo "DOCKERFILE                    -> $DOCKERFILE"
     echo "DOCKER_BUILD_ARGS             -> $DOCKER_BUILD_ARGS"
@@ -210,6 +211,20 @@ function initialization {
     echo "End of Life                   -> $END_OF_LIFE_1_YEAR"
 }
 
+function get_packages_to_install {
+    echo "+++ Get packages to install"
+    packagesFilePath="$CONTAINER_SRC_DIR/$IMAGE/$PACKAGE_FILE"
+    PACKAGES_TO_INSTALL=$(paste -s -d' ' < "$packagesFilePath")
+    echo "Packages to install           -> $PACKAGES_TO_INSTALL"
+}
+
+function get_component_name {
+    echo "+++ Get Component name"
+    componentFilePath="$CONTAINER_SRC_DIR/$IMAGE/$COMPONENT_FILE"
+    COMPONENT=$(cat "$componentFilePath")
+    echo "Component name                -> $COMPONENT"
+}
+
 function prepare_dockerfile {
     echo "+++ Prepare dockerfile"
     # Copy original dockerfile from Azure Linux repo.
@@ -230,13 +245,6 @@ function prepare_dockerfile {
     echo ""
 }
 
-function get_packages_to_install {
-    echo "+++ Get packages to install"
-    packagesFilePath="$CONTAINER_SRC_DIR/$IMAGE/$PACKAGE_FILE"
-    PACKAGES_TO_INSTALL=$(paste -s -d' ' < "$packagesFilePath")
-    echo "Packages to install           -> $PACKAGES_TO_INSTALL"
-}
-
 function prepare_docker_directory {
     echo "+++ Prepare docker directory"
     # Get additional required files for the container build from Azure Linux repo.
@@ -389,8 +397,9 @@ function distroless_container {
 print_inputs
 validate_inputs
 initialization
-prepare_dockerfile
 get_packages_to_install
+get_component_name
+prepare_dockerfile
 prepare_docker_directory
 docker_build
 set_image_tag

.pipelines/containerSourceData/sriovnetworkdeviceplugin/sriovnetworkdeviceplugin.name

@@ -0,0 +1 @@
+sriov-network-device-plugin

.pipelines/containerSourceData/telegraf/telegraf.name

@@ -0,0 +1 @@
+telegraf

.pipelines/containerSourceData/tensorflow/tensorflow.name

@@ -0,0 +1 @@
+python3-tensorflow

.pipelines/containerSourceData/tensorflow/tensorflow.pkg

@@ -1,13 +1,11 @@
 ca-certificates
 curl
 python3
-python3-keras
 python3-numpy
 python3-pip
 python3-setuptools
-python3-tensorboard
 python3-tensorboard-data-server
 python3-tensorboard-plugin-wit
+python3-pygments
 python3-tensorflow
-python3-tensorflow-estimator
 which

CONTRIBUTING.md

@@ -155,7 +155,7 @@ When creating your PR, please ensure the following:
 
 * Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files. When running the check section, results will not fail a build. Check the logs for the results of this section.
 
-* All package sources are available. The sources are either in the source server or local `SPECS` folder (`SPECS/<package>/SOURCES` or `SPECS/<package>`). While it is possible to build packages with all sources inside the repo, our policy is generally to have the source compressed and placed on the source server. Uploading to the source server can only be accomplished by an Azure Linux developer. Please request help in your PR for uploading your sources to the source server. To check the source server see [https://cblmarinerstorage.blob.core.windows.net/sources/core/< source tar >].
+* All package sources are available. The sources are either in the source server or local `SPECS` folder (`SPECS/<package>/SOURCES` or `SPECS/<package>`). While it is possible to build packages with all sources inside the repo, our policy is generally to have the source compressed and placed on the source server. Uploading to the source server can only be accomplished by an Azure Linux developer. Please request help in your PR for uploading your sources to the source server. To check the source server see [https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/< source tar >].
 
 * cgmanifest files are up-to-date and alphabetically sorted. The cgmanifest files are used to record all package sources. They include the following files:
 

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -1838,6 +1838,7 @@
                 "python-uritemplate",
                 "python-urwid",
                 "python-varlink",
+                "python-versioneer",
                 "python-virt-firmware",
                 "python-voluptuous",
                 "python-waitress",

SPECS-EXTENDED/buildah/buildah.spec

@@ -21,7 +21,7 @@
 Summary:        A command line tool used for creating OCI Images
 Name:           buildah
 Version:        1.18.0
-Release:        24%{?dist}
+Release:        25%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -32,7 +32,7 @@ BuildRequires:  btrfs-progs-devel
 BuildRequires:  device-mapper-devel
 BuildRequires:  git
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-3%{?dist}
+BuildRequires:  glibc-static >= 2.38-4%{?dist}
 BuildRequires:  go-md2man
 BuildRequires:  go-rpm-macros
 BuildRequires:  golang
@@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon May 13 2024 Chris Co <[email protected]> - 1.18.0-25
+- Update to build dep latest glibc-static version
+
 * Mon Mar 11 2024 Dan Streetman <[email protected]> - 1.18.0-24
 - update to build dep latest glibc-static version
 

SPECS-EXTENDED/catatonit/catatonit.spec

@@ -3,7 +3,7 @@ Distribution:   Azure Linux
 
 Name: catatonit
 Version: 0.1.7
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: A signal-forwarding process manager for containers
 License: GPLv3+
 URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
 BuildRequires: file
 BuildRequires: gcc
 BuildRequires: git
-BuildRequires: glibc-static >= 2.38-3%{?dist}
+BuildRequires: glibc-static >= 2.38-4%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Mon May 13 2024 Chris Co <[email protected]> - 0.1.7-13
+- Update to build dep latest glibc-static version
+
 * Mon Mar 11 2024 Dan Streetman <[email protected]> - 0.1.7-12
 - update to build dep latest glibc-static version
 

SPECS-EXTENDED/dyninst/dyninst.spec

@@ -1,7 +1,7 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 14%{?dist}
+Release: 15%{?dist}
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
 
 # Extra requires just for the testsuite
 BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
-BuildRequires: glibc-static >= 2.38-3%{?dist}
+BuildRequires: glibc-static >= 2.38-4%{?dist}
 
 # Testsuite files should not provide/require anything
 %{?filter_setup:
@@ -194,6 +194,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Mon May 13 2024 Chris Co <[email protected]> - 10.1.0-15
+- Update to build dep latest glibc-static version
+
 * Mon Mar 11 2024 Dan Streetman <[email protected]> - 10.1.0-14
 - update to build dep latest glibc-static version
 

SPECS-EXTENDED/facter/facter.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "facter-4.2.5.gem": "e88e3fa874c1c735779704d1a4dd69b255ad5e34c8912857864469a852cb3f8d"
+  "facter-4.2.13.gem": "a4f293b585176b080c8f10e9adb7a4d1cfd484268dfef518b162a0422450264c"
  }
 }

SPECS-EXTENDED/facter/facter.spec

@@ -11,8 +11,8 @@
 %global debug_package %{nil}
 
 Name:           facter
-Version:        4.2.5
-Release:        2%{?dist}
+Version:        4.2.13
+Release:        1%{?dist}
 Summary:        Command and ruby library for gathering system information
 Vendor:		Microsoft Corporation
 Distribution:   Azure Linux
@@ -100,6 +100,9 @@ GEM_HOME="%{buildroot}%{gem_dir}" %{buildroot}%{_bindir}/facter
 %doc %{gem_docdir}
 
 %changelog
+* Tue May 07 2024 Andy Zaugg <[email protected]> 4.2.13-1
+- Bumped version to facter version which has Mariner Linux Support
+
 * Thu Dec 30 2021 Suresh Babu Chalamalasetty <[email protected]> 4.2.5-2
 - Initial CBL-Mariner import from Fedora 35 (license: MIT)
 - License verified

SPECS-EXTENDED/podman/podman.spec

@@ -1,4 +1,3 @@
-%global with_check 0
 %global with_debug 1
 
 %if 0%{?with_debug}
@@ -36,7 +35,7 @@
 
 Name:           podman
 Version:        4.1.1
-Release:        21%{?dist}
+Release:        23%{?dist}
 License:        ASL 2.0 and BSD and ISC and MIT and MPLv2.0
 Summary:        Manage Pods, Containers and Container Images
 Vendor:         Microsoft Corporation
@@ -51,7 +50,7 @@ BuildRequires:  go-md2man
 BuildRequires:  golang
 BuildRequires:  gcc
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-3%{?dist}
+BuildRequires:  glibc-static >= 2.38-4%{?dist}
 BuildRequires:  git
 BuildRequires:  go-rpm-macros
 BuildRequires:  gpgme-devel
@@ -387,6 +386,12 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 
 # rhcontainerbot account currently managed by lsm5
 %changelog
+* Tue May 14 2024 Pawel Winogrodzki <[email protected]> - 4.1.1-23
+- Cleaning up the invalid global 'with_check' macro.
+
+* Mon May 13 2024 Chris Co <[email protected]> - 4.1.1-22
+- Update to build dep latest glibc-static version
+
 * Mon Mar 11 2024 Dan Streetman <[email protected]> - 4.1.1-21
 - update to build dep latest glibc-static version
 

SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "SymCrypt-OpenSSL-1.4.2.tar.gz": "c48ecfac71507a5497bad6ac5df3cbf5d78339f7c4aa6fb382ed8a8e05053377"
+  "SymCrypt-OpenSSL-1.4.3.tar.gz": "9225dd28ff03ecface28df77617f22344e144817a9556d3df909484f5661004b"
  }
 }

SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.spec

@@ -1,6 +1,6 @@
 Summary:        The SymCrypt engine for OpenSSL (SCOSSL) allows the use of OpenSSL with SymCrypt as the provider for core cryptographic operations
 Name:           SymCrypt-OpenSSL
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -67,6 +67,10 @@ install SymCryptProvider/symcrypt_prov.cnf %{buildroot}%{_sysconfdir}/pki/tls/sy
 %{_sysconfdir}/pki/tls/symcrypt_prov.cnf
 
 %changelog
+* Thu May 16 2024 Maxwell Moyer-McKee <[email protected]> - 1.4.3-1
+- Additional bugfixes for TLS connections
+- Add variable length GCM IV support to the SymCrypt engine
+
 * Thu Apr 25 2024 Maxwell Moyer-McKee <[email protected]> - 1.4.2-1
 - Support additional parameters in the SymCrypt provider required for TLS connections
 - Various bugfixes for TLS scenarios

SPECS/ansible/ansible.signatures.json

@@ -1,5 +1,5 @@
 {
   "Signatures": {
-    "ansible-2.15.3.tar.gz": "1ce23850aefcee176931d3f4f190af8c87461e63b90d0a84a3188d30a83343c2"
+    "ansible-2.17.0.tar.gz": "8ade6a00bdc256c65dfb3c05e05cfffbbcb7f0a37a0cb978c2ab388e37416d14"
   }
 }