Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
clemlesne committed Oct 10, 2024
2 parents ed7bb8b + 2ad3edd commit ff22f4a
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
5 changes: 5 additions & 0 deletions docs/content/docs/advanced-topics/build-aspnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ It was chosen arbitrarily to install the LTS non SDK version of ASNP.NET. Becaus
- LTS is better supported by Microsoft than STS
- The non-SDK is lighter when included in a container, knowing that not everyone will use it for building purposes

Bundled versions installed depends on the image used:

- Debian Bullseye (11) and Ubuntu Focal (20.04) use the `6.x` version (Microsoft doesn't support any LTS upgrades for these versions)
- Other images use the `8.x` version

It is recommended that development teams to hard-code the framework version you want to use, in your pipeline. With this setup, the developer controls its environment, not the platform. If they decide to upgrade, they update the pipeline, if not, not. This is under the responsibility of the developer.

The ASP.NET framework can be installed on the fly with [UseDotNet@2](https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/use-dotnet-v2?view=azure-pipelines):
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-bookworm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-bookworm-slim@sha256:4f1519bfe954d5caf962f5502c4252d5d39d45517aa68e6b5847e72fd10769b4 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim@sha256:b3cdb99fb356091b6395f3444d355da8ae5d63572ba777bed95b65848d6e02be AS base

# Force apt-get to not use TTY
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-bullseye
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim@sha256:c39b4582563fed008cb8e83d44388cf80dbc4e8cf8803869f5799205fcb126eb AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim@sha256:3717ce4bc6e34336ac100762eb766dc9cb739543686d0189001c1cafa57ba29c AS base

# Force apt-get to not use TTY
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-focal
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal@sha256:2e686e012918cd62109385348ae441ecc6702dad90b0de15ca37eb5851fe43cf AS base
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal@sha256:85452c433603c39424da21d775002072bf6d9e5ec9ae3e4e62f5b8f3046200c5 AS base

# Force apt-get to not use TTY
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-jammy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy@sha256:36f90c72b200f455e130a48fc279080aff296b4d506e29b9619fe82ae3853c4b AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy@sha256:d41af821cc90286d7c0d81c6a25733846ee7eebb2b55479934af909afd36471a AS base

# Force apt-get to not use TTY
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-ubi8
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV PYTHONDONTWRITEBYTECODE=1
ARG JQ_VERSION
RUN --mount=target=/var/cache/yum,type=cache,sharing=locked \
microdnf install -y --nodocs --setopt=install_weak_deps=0 \
aspnetcore-runtime-6.0 \
aspnetcore-runtime-8.0 \
ca-certificates \
cargo \
curl \
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-ubi9
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV PYTHONDONTWRITEBYTECODE=1
ARG JQ_VERSION
RUN --mount=target=/var/cache/yum,type=cache,sharing=locked \
microdnf install -y --nodocs --setopt=install_weak_deps=0 \
aspnetcore-runtime-6.0 \
aspnetcore-runtime-8.0 \
ca-certificates \
cargo \
findutils \
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-win-ltsc2019
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0-windowsservercore-ltsc2019@sha256:e3f6f63b2be79b773ac123accc47f70081e8377db2d7b46c2015a16e0e708492
FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2019@sha256:64ae795d03e5baff18006980118cc43089f4cf51c1f7ae84b41421772633bd01

# Configure local user
USER ContainerAdministrator
Expand Down
2 changes: 1 addition & 1 deletion src/docker/Dockerfile-win-ltsc2022
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0-windowsservercore-ltsc2022@sha256:6e55dbc81647b9b0d7b68db015313ee5d24eab44a7daf411d2c05454e44c5ee0
FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022@sha256:a5daa91a8bbf6dbbdfde03490343c3234b356dcbb0740cd33fd1417b34670c38

# Configure local user
USER ContainerAdministrator
Expand Down

0 comments on commit ff22f4a

Please sign in to comment.