Skip to content

Commit 0f00bbc

Browse files
dotnet-docker-botdotnet-docker-bot
committed
[nightly] Update dependencies from syft
1 parent 920e0b9 commit 0f00bbc

99 files changed

Lines changed: 227 additions & 226 deletions

File tree

Some content is hidden

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

‎eng/common/templates/jobs/publish.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,11 @@ jobs:
138138
- script: mkdir -p $(Build.ArtifactStagingDirectory)/eol-annotation-data
139139
displayName: Create EOL Annotation Data Directory
140140

141-
- script: >
142-
curl -fSL
141+
- powershell: >-
142+
$(engCommonPath)/Invoke-WithRetry.ps1
143+
"curl -fSL
143144
--output $(imageInfoHostDir)/full-image-info-orig.json
144-
https://raw.githubusercontent.com/$(gitHubVersionsRepoInfo.org)/$(gitHubVersionsRepoInfo.repo)/refs/heads/$(gitHubVersionsRepoInfo.branch)/$(gitHubImageInfoVersionsPath)
145+
https://raw.githubusercontent.com/$(gitHubVersionsRepoInfo.org)/$(gitHubVersionsRepoInfo.repo)/refs/heads/$(gitHubVersionsRepoInfo.branch)/$(gitHubImageInfoVersionsPath)"
145146
condition: and(succeeded(), eq(variables['publishImageInfo'], 'true'))
146147
displayName: Download Latest Image Info
147148

‎eng/common/templates/variables/docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2744543
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2746495
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

‎manifest.versions.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"aspnet|8.0|build-version": "8.0.18",
2525
"aspnet-composite|8.0|build-version": "$(aspnet|8.0|build-version)",
2626

27-
"aspnet|10.0|build-version": "10.0.0-preview.6.25326.107",
27+
"aspnet|10.0|build-version": "10.0.0-preview.6.25358.103",
2828
"aspnet-composite|10.0|build-version": "$(aspnet|10.0|build-version)",
2929

3030
"aspnet|9.0|build-version": "9.0.7",
@@ -99,8 +99,8 @@
9999
"libssl|noble": "3t64",
100100
"libssl|trixie": "3t64",
101101

102-
"mingit|latest|x64|url": "https://github.com/git-for-windows/git/releases/download/v2.50.0.windows.2/MinGit-2.50.0.2-64-bit.zip",
103-
"mingit|latest|x64|sha": "6d28c7e9f9c219a16c078c94a80492dd10fa309fbd17a67b2230736fdfb263b9",
102+
"mingit|latest|x64|url": "https://github.com/git-for-windows/git/releases/download/v2.50.1.windows.1/MinGit-2.50.1-64-bit.zip",
103+
"mingit|latest|x64|sha": "6f672aebe9e488a246efd6875f9197dbc0d9a40100e218acc3877cba2b206c45",
104104
"mingit|8.0|x64|url": "$(mingit|latest|x64|url)",
105105
"mingit|8.0|x64|sha": "$(mingit|latest|x64|sha)",
106106
"mingit|9.0|x64|url": "$(mingit|latest|x64|url)",
@@ -196,7 +196,7 @@
196196

197197
"runtime|8.0|build-version": "8.0.18",
198198
"runtime|9.0|build-version": "9.0.7",
199-
"runtime|10.0|build-version": "10.0.0-preview.6.25326.107",
199+
"runtime|10.0|build-version": "10.0.0-preview.6.25358.103",
200200

201201
"sdk|8.0|build-version": "8.0.412",
202202
"sdk|8.0|product-version": "8.0.412",
@@ -208,7 +208,7 @@
208208
"sdk|9.0|fixed-tag": "$(sdk|9.0|product-version)",
209209
"sdk|9.0|minor-tag": "$(dotnet|9.0|minor-tag)",
210210

211-
"sdk|10.0|build-version": "10.0.100-preview.6.25326.107",
211+
"sdk|10.0|build-version": "10.0.100-preview.6.25358.103",
212212
"sdk|10.0|product-version": "10.0.100-preview.6",
213213
"sdk|10.0|fixed-tag": "$(sdk|10.0|product-version)",
214214
"sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)",

‎src/aspnet/10.0/alpine3.22-composite/amd64/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
44
FROM $REPO:10.0.0-preview.6-alpine3.22-amd64 AS installer
55

66
# Retrieve ASP.NET Composite Runtime
7-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
7+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \
1010
https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
@@ -21,9 +21,9 @@ FROM $REPO:10.0.0-preview.6-alpine3.22-amd64
2121

2222
ENV \
2323
# .NET Runtime version
24-
DOTNET_VERSION=10.0.0-preview.6.25326.107 \
24+
DOTNET_VERSION=10.0.0-preview.6.25358.103 \
2525
# ASP.NET Core version
26-
ASPNET_VERSION=10.0.0-preview.6.25326.107
26+
ASPNET_VERSION=10.0.0-preview.6.25358.103
2727

2828
COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
2929
RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet

‎src/aspnet/10.0/alpine3.22-composite/arm32v7/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
44
FROM $REPO:10.0.0-preview.6-alpine3.22-arm32v7 AS installer
55

66
# Retrieve ASP.NET Composite Runtime
7-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
7+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \
1010
https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
@@ -21,9 +21,9 @@ FROM $REPO:10.0.0-preview.6-alpine3.22-arm32v7
2121

2222
ENV \
2323
# .NET Runtime version
24-
DOTNET_VERSION=10.0.0-preview.6.25326.107 \
24+
DOTNET_VERSION=10.0.0-preview.6.25358.103 \
2525
# ASP.NET Core version
26-
ASPNET_VERSION=10.0.0-preview.6.25326.107
26+
ASPNET_VERSION=10.0.0-preview.6.25358.103
2727

2828
COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
2929
RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet

‎src/aspnet/10.0/alpine3.22-composite/arm64v8/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps
44
FROM $REPO:10.0.0-preview.6-alpine3.22-arm64v8 AS installer
55

66
# Retrieve ASP.NET Composite Runtime
7-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
7+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \
1010
https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
@@ -21,9 +21,9 @@ FROM $REPO:10.0.0-preview.6-alpine3.22-arm64v8
2121

2222
ENV \
2323
# .NET Runtime version
24-
DOTNET_VERSION=10.0.0-preview.6.25326.107 \
24+
DOTNET_VERSION=10.0.0-preview.6.25358.103 \
2525
# ASP.NET Core version
26-
ASPNET_VERSION=10.0.0-preview.6.25326.107
26+
ASPNET_VERSION=10.0.0-preview.6.25358.103
2727

2828
COPY --from=installer ["/dotnet", "/usr/share/dotnet"]
2929
RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet

‎src/aspnet/10.0/alpine3.22/amd64/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
44
FROM $REPO:10.0.0-preview.6-alpine3.22-amd64 AS installer
55

66
# Retrieve ASP.NET Core
7-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
7+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \
1010
https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \
@@ -20,6 +20,6 @@ RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
2020
FROM $REPO:10.0.0-preview.6-alpine3.22-amd64
2121

2222
# ASP.NET Core version
23-
ENV ASPNET_VERSION=10.0.0-preview.6.25326.107
23+
ENV ASPNET_VERSION=10.0.0-preview.6.25358.103
2424

2525
COPY --from=installer ["/dotnet", "/usr/share/dotnet"]

‎src/aspnet/10.0/alpine3.22/arm32v7/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
44
FROM $REPO:10.0.0-preview.6-alpine3.22-arm32v7 AS installer
55

66
# Retrieve ASP.NET Core
7-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
7+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \
1010
https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \
@@ -20,6 +20,6 @@ RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
2020
FROM $REPO:10.0.0-preview.6-alpine3.22-arm32v7
2121

2222
# ASP.NET Core version
23-
ENV ASPNET_VERSION=10.0.0-preview.6.25326.107
23+
ENV ASPNET_VERSION=10.0.0-preview.6.25358.103
2424

2525
COPY --from=installer ["/dotnet", "/usr/share/dotnet"]

‎src/aspnet/10.0/alpine3.22/arm64v8/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
44
FROM $REPO:10.0.0-preview.6-alpine3.22-arm64v8 AS installer
55

66
# Retrieve ASP.NET Core
7-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
7+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
88
&& wget \
99
https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \
1010
https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \
@@ -20,6 +20,6 @@ RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
2020
FROM $REPO:10.0.0-preview.6-alpine3.22-arm64v8
2121

2222
# ASP.NET Core version
23-
ENV ASPNET_VERSION=10.0.0-preview.6.25326.107
23+
ENV ASPNET_VERSION=10.0.0-preview.6.25358.103
2424

2525
COPY --from=installer ["/dotnet", "/usr/share/dotnet"]

‎src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN tdnf install -y \
1010
&& tdnf clean all
1111

1212
# Retrieve ASP.NET Composite Runtime
13-
RUN aspnetcore_version=10.0.0-preview.6.25326.107 \
13+
RUN aspnetcore_version=10.0.0-preview.6.25358.103 \
1414
&& curl --fail --show-error --location \
1515
--remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \
1616
--remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \
@@ -30,9 +30,9 @@ FROM $REPO:10.0.0-preview.6-azurelinux3.0-distroless-extra-amd64
3030

3131
ENV \
3232
# .NET Runtime version
33-
DOTNET_VERSION=10.0.0-preview.6.25326.107 \
33+
DOTNET_VERSION=10.0.0-preview.6.25358.103 \
3434
# ASP.NET Core version
35-
ASPNET_VERSION=10.0.0-preview.6.25326.107
35+
ASPNET_VERSION=10.0.0-preview.6.25358.103
3636

3737
COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
3838
COPY --from=installer ["/dotnet-symlink", "/usr/bin"]

0 commit comments

Comments
 (0)