Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support localization in sdk for Alpine 3.16 #3847

Merged
merged 4 commits into from
Jun 16, 2022
Merged

Support localization in sdk for Alpine 3.16 #3847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ad8cc9
Support localization in sdk for Alpine 3.16
mthalman Jun 15, 2022
fb5d1c5
Use new tag names
mthalman Jun 15, 2022
bf70539
Remove tag updates for non-sdk images/update .NET Monitor base tag
mthalman Jun 15, 2022
f6a7f5f
update format
mthalman Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README.sdk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ The following samples show how to develop, build and test .NET applications with
Tags | Dockerfile | OS Version
-----------| -------------| -------------
6.0.301-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.301-bullseye-slim, 6.0-bullseye-slim, 6.0.301, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11
6.0.301-alpine3.16-amd64, 6.0-alpine3.16-amd64, 6.0-alpine-amd64, 6.0.301-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/amd64/Dockerfile) | Alpine 3.16
6.0.301-1-alpine3.16-amd64, 6.0-alpine3.16-amd64, 6.0-alpine-amd64, 6.0.301-1-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/amd64/Dockerfile) | Alpine 3.16
6.0.301-alpine3.15-amd64, 6.0-alpine3.15-amd64, 6.0.301-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/amd64/Dockerfile) | Alpine 3.15
6.0.301-alpine3.14-amd64, 6.0-alpine3.14-amd64, 6.0.301-alpine3.14, 6.0-alpine3.14 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.14/amd64/Dockerfile) | Alpine 3.14
6.0.301-jammy-amd64, 6.0-jammy-amd64, 6.0.301-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
6.0.301-focal-amd64, 6.0-focal-amd64, 6.0.301-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04
3.1.420-bullseye, 3.1-bullseye | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/bullseye/amd64/Dockerfile) | Debian 11
3.1.420-buster, 3.1-buster, 3.1.420, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/buster/amd64/Dockerfile) | Debian 10
3.1.420-alpine3.16, 3.1-alpine3.16, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/alpine3.16/amd64/Dockerfile) | Alpine 3.16
3.1.420-1-alpine3.16, 3.1-alpine3.16, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/alpine3.16/amd64/Dockerfile) | Alpine 3.16
3.1.420-alpine3.15, 3.1-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/alpine3.15/amd64/Dockerfile) | Alpine 3.15
3.1.420-alpine3.14, 3.1-alpine3.14 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/alpine3.14/amd64/Dockerfile) | Alpine 3.14
3.1.420-focal, 3.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/focal/amd64/Dockerfile) | Ubuntu 20.04
Expand All @@ -72,14 +72,14 @@ Tags | Dockerfile | OS Version
Tags | Dockerfile | OS Version
-----------| -------------| -------------
7.0.100-preview.5-bullseye-slim-amd64, 7.0-bullseye-slim-amd64, 7.0.100-preview.5-bullseye-slim, 7.0-bullseye-slim, 7.0.100-preview.5, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bullseye-slim/amd64/Dockerfile) | Debian 11
7.0.100-preview.5-alpine3.16-amd64, 7.0-alpine3.16-amd64, 7.0-alpine-amd64, 7.0.100-preview.5-alpine3.16, 7.0-alpine3.16, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.16/amd64/Dockerfile) | Alpine 3.16
7.0.100-preview.5-1-alpine3.16-amd64, 7.0-alpine3.16-amd64, 7.0-alpine-amd64, 7.0.100-preview.5-1-alpine3.16, 7.0-alpine3.16, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.16/amd64/Dockerfile) | Alpine 3.16
7.0.100-preview.5-jammy-amd64, 7.0-jammy-amd64, 7.0.100-preview.5-jammy, 7.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/jammy/amd64/Dockerfile) | Ubuntu 22.04

## Linux arm64 Tags
Tags | Dockerfile | OS Version
-----------| -------------| -------------
6.0.301-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.301-bullseye-slim, 6.0-bullseye-slim, 6.0.301, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11
6.0.301-alpine3.16-arm64v8, 6.0-alpine3.16-arm64v8, 6.0-alpine-arm64v8, 6.0.301-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile) | Alpine 3.16
6.0.301-1-alpine3.16-arm64v8, 6.0-alpine3.16-arm64v8, 6.0-alpine-arm64v8, 6.0.301-1-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile) | Alpine 3.16
6.0.301-alpine3.15-arm64v8, 6.0-alpine3.15-arm64v8, 6.0.301-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile) | Alpine 3.15
6.0.301-alpine3.14-arm64v8, 6.0-alpine3.14-arm64v8, 6.0.301-alpine3.14, 6.0-alpine3.14 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.14/arm64v8/Dockerfile) | Alpine 3.14
6.0.301-jammy-arm64v8, 6.0-jammy-arm64v8, 6.0.301-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
Expand All @@ -93,14 +93,14 @@ Tags | Dockerfile | OS Version
Tags | Dockerfile | OS Version
-----------| -------------| -------------
7.0.100-preview.5-bullseye-slim-arm64v8, 7.0-bullseye-slim-arm64v8, 7.0.100-preview.5-bullseye-slim, 7.0-bullseye-slim, 7.0.100-preview.5, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11
7.0.100-preview.5-alpine3.16-arm64v8, 7.0-alpine3.16-arm64v8, 7.0-alpine-arm64v8, 7.0.100-preview.5-alpine3.16, 7.0-alpine3.16, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.16/arm64v8/Dockerfile) | Alpine 3.16
7.0.100-preview.5-1-alpine3.16-arm64v8, 7.0-alpine3.16-arm64v8, 7.0-alpine-arm64v8, 7.0.100-preview.5-1-alpine3.16, 7.0-alpine3.16, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.16/arm64v8/Dockerfile) | Alpine 3.16
7.0.100-preview.5-jammy-arm64v8, 7.0-jammy-arm64v8, 7.0.100-preview.5-jammy, 7.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04

## Linux arm32 Tags
Tags | Dockerfile | OS Version
-----------| -------------| -------------
6.0.301-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.301-bullseye-slim, 6.0-bullseye-slim, 6.0.301, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11
6.0.301-alpine3.16-arm32v7, 6.0-alpine3.16-arm32v7, 6.0-alpine-arm32v7, 6.0.301-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile) | Alpine 3.16
6.0.301-1-alpine3.16-arm32v7, 6.0-alpine3.16-arm32v7, 6.0-alpine-arm32v7, 6.0.301-1-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile) | Alpine 3.16
6.0.301-alpine3.15-arm32v7, 6.0-alpine3.15-arm32v7, 6.0.301-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile) | Alpine 3.15
6.0.301-alpine3.14-arm32v7, 6.0-alpine3.14-arm32v7, 6.0.301-alpine3.14, 6.0-alpine3.14 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.14/arm32v7/Dockerfile) | Alpine 3.14
6.0.301-jammy-arm32v7, 6.0-jammy-arm32v7, 6.0.301-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
Expand All @@ -114,7 +114,7 @@ Tags | Dockerfile | OS Version
Tags | Dockerfile | OS Version
-----------| -------------| -------------
7.0.100-preview.5-bullseye-slim-arm32v7, 7.0-bullseye-slim-arm32v7, 7.0.100-preview.5-bullseye-slim, 7.0-bullseye-slim, 7.0.100-preview.5, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11
7.0.100-preview.5-alpine3.16-arm32v7, 7.0-alpine3.16-arm32v7, 7.0-alpine-arm32v7, 7.0.100-preview.5-alpine3.16, 7.0-alpine3.16, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.16/arm32v7/Dockerfile) | Alpine 3.16
7.0.100-preview.5-1-alpine3.16-arm32v7, 7.0-alpine3.16-arm32v7, 7.0-alpine-arm32v7, 7.0.100-preview.5-1-alpine3.16, 7.0-alpine3.16, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.16/arm32v7/Dockerfile) | Alpine 3.16
7.0.100-preview.5-jammy-arm32v7, 7.0-jammy-arm32v7, 7.0.100-preview.5-jammy, 7.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04

## Nano Server 2022 amd64 Tags
Expand Down
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/monitor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set monitorMajor to split(PRODUCT_VERSION, ".")[0] ^
set targetFrameworkMoniker to cat("net", dotnetMajorMinor) ^
set targetFrameworkMonikerRegex to cat("net", dotnetMajor, "[.]0") ^
set installerBaseTag to cat(VARIABLES[cat("sdk|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
set installerBaseTag to cat(VARIABLES[cat("sdk|", dotnetMajorMinor, "|product-version")], "-", when(OS_VERSION = "alpine3.16", "1-", ""), OS_VERSION, ARCH_TAG_SUFFIX) ^
set monitorMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
set buildVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|build-version")] ^
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
Expand Down
21 changes: 15 additions & 6 deletions eng/dockerfile-templates/sdk/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@
baseImageTag,
cat(ARCH_VERSIONED, "/buildpack-deps:", OS_VERSION_BASE, "-curl")) ^
set pkgs to filter(when(isAlpine,
[
"curl",
"icu-libs",
"git"
],
when(find(OS_VERSION, "3.14") < 0 && find(OS_VERSION, "3.15") < 0,
[
"curl",
"icu-data-full",
"icu-libs",
"git"
],
[
"curl",
"icu-libs",
"git"
]),
when(isMariner,
[
"git",
Expand Down Expand Up @@ -52,7 +59,9 @@ ARG SAS_QUERY_STRING
{{InsertTemplate("Dockerfile.envs", ["based-on-buildpack-deps": isBasedOnBuildpackDeps])}}
{{if isAlpine && dotnetVersion = "3.1":
# Add dependencies for disabling invariant mode (set in base image)
RUN apk add --no-cache icu-libs
RUN apk add --no-cache \
{{if find(OS_VERSION, "3.14") < 0 && find(OS_VERSION, "3.15") < 0:icu-data-full \
}}icu-libs
}}{{if dotnetVersion != "3.1":
RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs",
[
Expand Down
18 changes: 9 additions & 9 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4601,7 +4601,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|3.1|product-version)-alpine3.16": {},
"$(sdk|3.1|product-version)-1-alpine3.16": {},
"3.1-alpine3.16": {},
"3.1-alpine": {
"syndication": {
Expand Down Expand Up @@ -5077,7 +5077,7 @@
{
"productVersion": "$(sdk|6.0|product-version)",
"sharedTags": {
"$(sdk|6.0|product-version)-alpine3.16": {},
"$(sdk|6.0|product-version)-1-alpine3.16": {},
"6.0-alpine3.16": {},
"6.0-alpine": {}
},
Expand All @@ -5091,7 +5091,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|6.0|product-version)-alpine3.16-amd64": {},
"$(sdk|6.0|product-version)-1-alpine3.16-amd64": {},
"6.0-alpine3.16-amd64": {},
"6.0-alpine-amd64": {}
}
Expand All @@ -5106,7 +5106,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|6.0|product-version)-alpine3.16-arm32v7": {},
"$(sdk|6.0|product-version)-1-alpine3.16-arm32v7": {},
"6.0-alpine3.16-arm32v7": {},
"6.0-alpine-arm32v7": {}
},
Expand All @@ -5122,7 +5122,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|6.0|product-version)-alpine3.16-arm64v8": {},
"$(sdk|6.0|product-version)-1-alpine3.16-arm64v8": {},
"6.0-alpine3.16-arm64v8": {},
"6.0-alpine-arm64v8": {}
},
Expand Down Expand Up @@ -5483,7 +5483,7 @@
{
"productVersion": "$(sdk|7.0|product-version)",
"sharedTags": {
"$(sdk|7.0|product-version)-alpine3.16": {},
"$(sdk|7.0|product-version)-1-alpine3.16": {},
"7.0-alpine3.16": {},
"7.0-alpine": {}
},
Expand All @@ -5497,7 +5497,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|7.0|product-version)-alpine3.16-amd64": {},
"$(sdk|7.0|product-version)-1-alpine3.16-amd64": {},
"7.0-alpine3.16-amd64": {},
"7.0-alpine-amd64": {}
}
Expand All @@ -5512,7 +5512,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|7.0|product-version)-alpine3.16-arm32v7": {},
"$(sdk|7.0|product-version)-1-alpine3.16-arm32v7": {},
"7.0-alpine3.16-arm32v7": {},
"7.0-alpine-arm32v7": {}
},
Expand All @@ -5528,7 +5528,7 @@
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(sdk|7.0|product-version)-alpine3.16-arm64v8": {},
"$(sdk|7.0|product-version)-1-alpine3.16-arm64v8": {},
"7.0-alpine3.16-arm64v8": {},
"7.0-alpine-arm64v8": {}
},
Expand Down
2 changes: 1 addition & 1 deletion src/monitor/6.1/alpine/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk

# Installer image
FROM $SDK_REPO:6.0.301-alpine3.16-amd64 AS installer
FROM $SDK_REPO:6.0.301-1-alpine3.16-amd64 AS installer

# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.1.2
Expand Down
2 changes: 1 addition & 1 deletion src/monitor/6.2/alpine/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk

# Installer image
FROM $SDK_REPO:6.0.301-alpine3.16-amd64 AS installer
FROM $SDK_REPO:6.0.301-1-alpine3.16-amd64 AS installer

# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.2.0
Expand Down
2 changes: 1 addition & 1 deletion src/monitor/6.2/alpine/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk

# Installer image
FROM $SDK_REPO:6.0.301-alpine3.16-arm64v8 AS installer
FROM $SDK_REPO:6.0.301-1-alpine3.16-arm64v8 AS installer

# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.2.0
Expand Down
2 changes: 1 addition & 1 deletion src/monitor/7.0/alpine/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk

# Installer image
FROM $SDK_REPO:7.0.100-preview.5-alpine3.16-amd64 AS installer
FROM $SDK_REPO:7.0.100-preview.5-1-alpine3.16-amd64 AS installer

# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=7.0.0-preview.5.22306.5
Expand Down
2 changes: 1 addition & 1 deletion src/monitor/7.0/alpine/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk

# Installer image
FROM $SDK_REPO:7.0.100-preview.5-alpine3.16-arm64v8 AS installer
FROM $SDK_REPO:7.0.100-preview.5-1-alpine3.16-arm64v8 AS installer

# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=7.0.0-preview.5.22306.5
Expand Down
3 changes: 2 additions & 1 deletion src/sdk/3.1/alpine3.14/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ ENV \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Alpine-3.14

# Add dependencies for disabling invariant mode (set in base image)
RUN apk add --no-cache icu-libs
RUN apk add --no-cache \
icu-libs

# Install .NET Core SDK
RUN sdk_version=3.1.420 \
Expand Down
3 changes: 2 additions & 1 deletion src/sdk/3.1/alpine3.15/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ ENV \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Alpine-3.15

# Add dependencies for disabling invariant mode (set in base image)
RUN apk add --no-cache icu-libs
RUN apk add --no-cache \
icu-libs

# Install .NET Core SDK
RUN sdk_version=3.1.420 \
Expand Down
4 changes: 3 additions & 1 deletion src/sdk/3.1/alpine3.16/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ ENV \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Alpine-3.16

# Add dependencies for disabling invariant mode (set in base image)
RUN apk add --no-cache icu-libs
RUN apk add --no-cache \
icu-data-full \
icu-libs

# Install .NET Core SDK
RUN sdk_version=3.1.420 \
Expand Down
1 change: 1 addition & 0 deletions src/sdk/6.0/alpine3.16/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV \

RUN apk add --no-cache \
curl \
icu-data-full \
icu-libs \
git

Expand Down
1 change: 1 addition & 0 deletions src/sdk/6.0/alpine3.16/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV \

RUN apk add --no-cache \
curl \
icu-data-full \
icu-libs \
git

Expand Down
1 change: 1 addition & 0 deletions src/sdk/6.0/alpine3.16/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV \

RUN apk add --no-cache \
curl \
icu-data-full \
icu-libs \
git

Expand Down
1 change: 1 addition & 0 deletions src/sdk/7.0/alpine3.16/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV \

RUN apk add --no-cache \
curl \
icu-data-full \
icu-libs \
git

Expand Down
1 change: 1 addition & 0 deletions src/sdk/7.0/alpine3.16/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV \

RUN apk add --no-cache \
curl \
icu-data-full \
icu-libs \
git

Expand Down
1 change: 1 addition & 0 deletions src/sdk/7.0/alpine3.16/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENV \

RUN apk add --no-cache \
curl \
icu-data-full \
icu-libs \
git

Expand Down
Loading