Skip to content

Commit

Permalink
Use correct ca-certs pkg for full Mariner (dotnet#3527)
Browse files Browse the repository at this point in the history
(cherry picked from commit 6fd1cdd)
  • Loading branch information
mthalman committed Mar 7, 2022
1 parent a50003d commit d5aaa44
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion eng/dockerfile-templates/Dockerfile.linux.install-deps
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
])) ^
set certsPkgPrefix to when(isMariner,
[
when(dotnetVersion = "3.1" || dotnetVersion = "5.0", "ca-certificates", "prebuilt-ca-certificates"),
when(dotnetVersion = "3.1" || dotnetVersion = "5.0",
"ca-certificates",
when(isDistrolessMariner, "prebuilt-ca-certificates", "ca-certificates-microsoft")),
"",
dotnetDepsComment
],
Expand Down
2 changes: 1 addition & 1 deletion src/runtime-deps/6.0/cbl-mariner1.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM cblmariner.azurecr.io/base/core:1.0

RUN tdnf install -y \
prebuilt-ca-certificates \
ca-certificates-microsoft \
\
# .NET dependencies
glibc \
Expand Down
2 changes: 1 addition & 1 deletion src/runtime-deps/7.0/cbl-mariner1.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM cblmariner.azurecr.io/base/core:1.0

RUN tdnf install -y \
prebuilt-ca-certificates \
ca-certificates-microsoft \
\
# .NET dependencies
glibc \
Expand Down

0 comments on commit d5aaa44

Please sign in to comment.