Skip to content

Commit b8d1da2

Browse files
sameluchsameluch
authored
Merge branch 'fasttrack/3.0' into kanbansal/nodejs/3.0/CVE-2025-22150 
2 parents b17db45 + 1bd27f7 commit b8d1da2

File tree

325 files changed

+16315
-4640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+16315
-4640
lines changed

‎.CodeQL.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
path_classifiers:
2+
library:
3+
# Treat source files for all compiled languages in the specs directories
4+
# as 3rd party library sources because they are not owned by us.
5+
#
6+
# Extensions from https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/.
7+
- "SPECS*/**/*.c"
8+
- "SPECS*/**/*.c++"
9+
- "SPECS*/**/*.cc"
10+
- "SPECS*/**/*.cpp"
11+
- "SPECS*/**/*.cs"
12+
- "SPECS*/**/*.cshtml"
13+
- "SPECS*/**/*.csproj"
14+
- "SPECS*/**/*.cts"
15+
- "SPECS*/**/*.cxx"
16+
- "SPECS*/**/*.go"
17+
- "SPECS*/**/*.h"
18+
- "SPECS*/**/*.h++"
19+
- "SPECS*/**/*.hh"
20+
- "SPECS*/**/*.hpp"
21+
- "SPECS*/**/*.hxx"
22+
- "SPECS*/**/*.java"
23+
- "SPECS*/**/*.kt"
24+
- "SPECS*/**/*.mts"
25+
- "SPECS*/**/*.sln"
26+
- "SPECS*/**/*.swift"
27+
- "SPECS*/**/*.ts"
28+
- "SPECS*/**/*.tsx"
29+
- "SPECS*/**/*.xaml"

‎.github/workflows/quickstart_2.0.yml

Lines changed: 52 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,64 +3,55 @@
33
#
44
# Workflow to automatedly verify the quickstart instructions
55

6-
name: Verify Quickstart 2.0
6+
name: Verify Quickstart 3.0
77

88
on:
99
workflow_dispatch:
1010
schedule:
1111
- cron: "0 15 * * *"
1212

1313
jobs:
14-
get_input-srpms:
15-
runs-on: ubuntu-latest
16-
17-
steps:
18-
- name: Checkout
19-
uses: actions/checkout@v4
20-
with:
21-
ref: '2.0-stable'
22-
23-
- name: Set up Go 1.20
24-
uses: actions/setup-go@v5
25-
with:
26-
go-version: 1.20
27-
id: go
28-
29-
- name: Install Remaining Prerequisites
30-
run: |
31-
# Golang and docker are already installed on the agent
32-
sudo apt-get update
33-
sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
34-
sudo apt -y install pigz
35-
36-
- name: Download SRPMS
37-
run: |
38-
pushd toolkit
39-
sudo make go-tools REBUILD_TOOLS=y
40-
sudo make input-srpms DOWNLOAD_SRPMS=y
41-
popd
42-
4314
iso_quickstart:
4415
runs-on: ubuntu-latest
4516

4617
steps:
4718
- name: Checkout
4819
uses: actions/checkout@v4
4920
with:
50-
ref: '2.0-stable'
21+
ref: '3.0-stable'
5122

52-
- name: Set up Go 1.20
23+
- name: Set up Go 1.21
5324
uses: actions/setup-go@v5
5425
with:
55-
go-version: 1.20
26+
go-version: 1.21
5627
id: go
5728

5829
- name: Install Remaining Prerequisites
5930
run: |
6031
# Golang and docker are already installed on the agent
6132
sudo apt-get update
62-
sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
63-
sudo apt -y install pigz
33+
sudo apt -y install \
34+
acl \
35+
curl \
36+
gawk \
37+
genisoimage \
38+
git \
39+
golang-1.21-go \
40+
jq \
41+
make \
42+
parted \
43+
pigz \
44+
openssl \
45+
systemd \
46+
qemu-utils \
47+
rpm \
48+
tar \
49+
wget \
50+
xfsprogs
51+
52+
# Fix go 1.21 link
53+
sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
54+
sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
6455
6556
- name: ISO Quick Start
6657
run: |
@@ -75,23 +66,41 @@ jobs:
7566
- name: Checkout
7667
uses: actions/checkout@v4
7768
with:
78-
ref: '2.0-stable'
69+
ref: '3.0-stable'
7970

80-
- name: Set up Go 1.20
71+
- name: Set up Go 1.21
8172
uses: actions/setup-go@v5
8273
with:
83-
go-version: 1.20
74+
go-version: 1.21
8475
id: go
8576

8677
- name: Install Remaining Prerequisites
8778
run: |
8879
# Golang and docker are already installed on the agent
89-
sudo apt-get update
90-
sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
91-
sudo apt -y install pigz
92-
80+
sudo apt -y install \
81+
acl \
82+
curl \
83+
gawk \
84+
genisoimage \
85+
git \
86+
golang-1.21-go \
87+
jq \
88+
make \
89+
parted \
90+
pigz \
91+
openssl \
92+
systemd \
93+
qemu-utils \
94+
rpm \
95+
tar \
96+
wget \
97+
xfsprogs
98+
99+
# Fix go 1.21 link
100+
sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
101+
sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
93102
- name: VHDX Quick Start
94103
run: |
95104
pushd toolkit
96105
sudo make image REBUILD_TOOLS=y REBUILD_PACKAGES=n CONFIG_FILE=./imageconfigs/core-efi.json
97-
popd
106+
popd

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-apiserver ] && mv -f /usr/bin/virt-cdi-apiserver /usr/bin/cdi-apiserver
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-apiserver
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-controller ] && mv -f /usr/bin/virt-cdi-controller /usr/bin/cdi-controller
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-controller
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-importer ] && mv -f /usr/bin/virt-cdi-importer /usr/bin/cdi-importer
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-importer
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-operator ] && mv -f /usr/bin/virt-cdi-operator /usr/bin/cdi-operator
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-operator
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-uploadproxy ] && mv -f /usr/bin/virt-cdi-uploadproxy /usr/bin/cdi-uploadproxy
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-uploadproxy
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-uploadserver ] && mv -f /usr/bin/virt-cdi-uploadserver /usr/bin/cdi-uploadserver
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-uploadserver
1815

‎.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function get_component_name_and_version {
167167
COMPONENT="$IMAGE"
168168
echo "Component name -> $COMPONENT"
169169

170-
COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE* | rev | cut -d '.' -f 2- | rev)
170+
COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE-[0-9]* | rev | cut -d '.' -f 2- | rev)
171171
echo "Component Version -> $COMPONENT_VERSION"
172172
}
173173

‎.pipelines/containerSourceData/valkey/Dockerfile-Valkey

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
3+
4+
ARG BASE_IMAGE
5+
6+
FROM $BASE_IMAGE
7+
8+
@INCLUDE_MAIN_RUN_INSTRUCTION@
9+
10+
RUN set -eux && \
11+
valkey-cli --version && \
12+
valkey-server --version && \
13+
mkdir /data && \
14+
chown valkey:valkey /data
15+
16+
VOLUME /data
17+
WORKDIR /data
18+
19+
COPY valkey-docker-entrypoint.sh /usr/local/bin/
20+
21+
RUN chmod +x /usr/local/bin/valkey-docker-entrypoint.sh
22+
23+
ENTRYPOINT ["/usr/local/bin/valkey-docker-entrypoint.sh"]
24+
25+
EXPOSE 6379
26+
CMD ["valkey-server"]

‎.pipelines/containerSourceData/valkey/configuration-files/valkey-docker-entrypoint.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
# Copyright (c) Microsoft Corporation.
3+
# Licensed under the MIT License.
4+
set -e
5+
6+
# first arg is `-f` or `--some-option`
7+
# or first arg is `something.conf`
8+
if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
9+
set -- valkey-server "$@"
10+
fi
11+
12+
# allow the container to be started with `--user`
13+
if [ "$1" = 'valkey-server' -a "$(id -u)" = '0' ]; then
14+
find . \! -user valkey -exec chown valkey '{}' +
15+
exec setpriv --reuid=valkey --regid=valkey --init-groups --inh-caps=-all "$BASH_SOURCE" "$@"
16+
fi
17+
18+
# set an appropriate umask (if one isn't set already)
19+
# - https://github.com/docker-library/redis/issues/305
20+
# - https://github.com/redis/redis/blob/bb875603fb7ff3f9d19aad906bd45d7db98d9a39/utils/systemd-redis_server.service#L37
21+
um="$(umask)"
22+
if [ "$um" = '0022' ]; then
23+
umask 0077
24+
fi
25+
26+
exec "$@" $VALKEY_EXTRA_FLAGS

‎.pipelines/containerSourceData/valkey/valkey.name

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
valkey

‎.pipelines/containerSourceData/valkey/valkey.pkg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
valkey
2+
cronie
3+
util-linux

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@
547547
"kata-containers",
548548
"kde-filesystem",
549549
"kde-settings",
550+
"kernel-srpm-macros",
550551
"kexec-tools",
551552
"keybinder3",
552553
"keycloak-httpd-client-install",
@@ -1761,6 +1762,7 @@
17611762
"python-poetry-core",
17621763
"python-process-tests",
17631764
"python-productmd",
1765+
"python-prometheus_client",
17641766
"python-ptyprocess",
17651767
"python-pycares",
17661768
"python-pycosat",
@@ -1771,7 +1773,6 @@
17711773
"python-pyproject-metadata",
17721774
"python-pyroute2",
17731775
"python-pyrsistent",
1774-
"python-pysocks",
17751776
"python-pytest-benchmark",
17761777
"python-pytest-cov",
17771778
"python-pytest-expect",
@@ -2451,12 +2452,46 @@
24512452
"NVIDIA": {
24522453
"license": "[ASL 2.0 License and spec specific licenses](http://www.apache.org/licenses/LICENSE-2.0)",
24532454
"specs": [
2455+
"fwctl",
2456+
"fwctl-signed",
2457+
"ibarr",
2458+
"ibsim",
2459+
"iser",
2460+
"iser-signed",
2461+
"isert",
2462+
"isert-signed",
2463+
"knem",
2464+
"knem-modules-signed",
24542465
"libnvidia-container",
2466+
"mft_kernel",
2467+
"mft_kernel-signed",
2468+
"mlnx-ethtool",
2469+
"mlnx-iproute2",
2470+
"mlnx-nfsrdma",
2471+
"mlnx-nfsrdma-signed",
2472+
"mlnx-ofa_kernel",
2473+
"mlnx-ofa_kernel-modules-signed",
24552474
"mlnx-tools",
24562475
"mlx-bootctl",
2476+
"mlx-steering-dump",
2477+
"multiperf",
24572478
"nvidia-container-toolkit",
2479+
"ofed-docs",
24582480
"ofed-scripts",
2459-
"perftest"
2481+
"perftest",
2482+
"rshim",
2483+
"sockperf",
2484+
"srp",
2485+
"srp-signed",
2486+
"xpmem",
2487+
"xpmem-lib",
2488+
"xpmem-modules-signed"
2489+
]
2490+
},
2491+
"NVIDIA (BSD)": {
2492+
"license": "[BSD](https://github.com/Mellanox/sockperf/blob/sockperf_v2/copying)",
2493+
"specs": [
2494+
"sockperf"
24602495
]
24612496
},
24622497
"OpenEuler": {

0 commit comments

Comments
 (0)