Skip to content

Commit 9b98fd4

Browse files
committed
Use full build version in alpha environment variables
1 parent da97623 commit 9b98fd4

File tree

46 files changed

+68
-59
lines changed

Some content is hidden

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

46 files changed

+68
-59
lines changed

eng/dockerfile-templates/aspnet/Dockerfile.envs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
66
set buildVersion to VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")] ^
7-
set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
7+
set isStableBranding to
8+
find(buildVersion, "alpha") < 0
9+
&& find(buildVersion, "preview") < 0
10+
&& find(buildVersion, "rc.") < 0 ^
811

912
set runtimeVersion to when(isStableBranding,
1013
VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],

eng/dockerfile-templates/runtime/Dockerfile.envs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
66
set runtimeVersion to VARIABLES[cat("runtime|", dotnetVersion, "|build-version")] ^
7-
set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
7+
set isStableBranding to
8+
find(buildVersion, "alpha") < 0
9+
&& find(buildVersion, "preview") < 0
10+
&& find(buildVersion, "rc.") < 0 ^
811
set runtimeVersion to when(isStableBranding,
912
VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],
1013
VARIABLES[cat("runtime|", dotnetVersion, "|build-version")])

eng/dockerfile-templates/sdk/Dockerfile.envs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
66
set buildVersion to VARIABLES[cat("sdk|", dotnetVersion, "|build-version")] ^
7-
set isStableBranding to find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^
7+
set isStableBranding to
8+
find(buildVersion, "alpha") < 0
9+
&& find(buildVersion, "preview") < 0
10+
&& find(buildVersion, "rc.") < 0 ^
811

912
set sdkVersion to when(isStableBranding,
1013
VARIABLES[cat("sdk|", dotnetVersion, "|product-version")],

src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
2121

2222
ENV \
2323
# .NET Runtime version
24-
DOTNET_VERSION=11.0.0-alpha.1 \
24+
DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
2525
# ASP.NET Core version
26-
ASPNET_VERSION=11.0.0-alpha.1
26+
ASPNET_VERSION=11.0.0-alpha.1.25609.108
2727

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

src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
2121

2222
ENV \
2323
# .NET Runtime version
24-
DOTNET_VERSION=11.0.0-alpha.1 \
24+
DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
2525
# ASP.NET Core version
26-
ASPNET_VERSION=11.0.0-alpha.1
26+
ASPNET_VERSION=11.0.0-alpha.1.25609.108
2727

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

src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
2121

2222
ENV \
2323
# .NET Runtime version
24-
DOTNET_VERSION=11.0.0-alpha.1 \
24+
DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
2525
# ASP.NET Core version
26-
ASPNET_VERSION=11.0.0-alpha.1
26+
ASPNET_VERSION=11.0.0-alpha.1.25609.108
2727

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

src/aspnet/11.0/alpine3.23/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
2020
FROM $REPO:11.0.0-alpha.1-alpine3.23-amd64
2121

2222
# ASP.NET Core version
23-
ENV ASPNET_VERSION=11.0.0-alpha.1
23+
ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
2424

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

src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
2020
FROM $REPO:11.0.0-alpha.1-alpine3.23-arm32v7
2121

2222
# ASP.NET Core version
23-
ENV ASPNET_VERSION=11.0.0-alpha.1
23+
ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
2424

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

src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ RUN aspnetcore_version=11.0.0-alpha.1.25609.108 \
2020
FROM $REPO:11.0.0-alpha.1-alpine3.23-arm64v8
2121

2222
# ASP.NET Core version
23-
ENV ASPNET_VERSION=11.0.0-alpha.1
23+
ENV ASPNET_VERSION=11.0.0-alpha.1.25609.108
2424

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ FROM $REPO:11.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64
3030

3131
ENV \
3232
# .NET Runtime version
33-
DOTNET_VERSION=11.0.0-alpha.1 \
33+
DOTNET_VERSION=11.0.0-alpha.1.25609.108 \
3434
# ASP.NET Core version
35-
ASPNET_VERSION=11.0.0-alpha.1
35+
ASPNET_VERSION=11.0.0-alpha.1.25609.108
3636

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

0 commit comments

Comments
 (0)