Skip to content

Commit 357e648

Browse files
authored
Manually update zlib in Alpine 3.23 base image (#7112)
1 parent 0918f26 commit 357e648

37 files changed

Lines changed: 147 additions & 37 deletions

File tree

eng/dockerfile-templates/Dockerfile.linux.install-deps

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@
8585
dotnetDepsComment
8686
] ^
8787

88-
set pkgs to cat(prefixPkgs, pkgs) ^
88+
set suffixPkgs to when(isAlpine && dotnetVersion != "8.0", ["", "# manually update zlib from alpine base image", zlibPkg], []) ^
89+
90+
set pkgs to cat(prefixPkgs, pkgs, suffixPkgs) ^
8991

9092
set pkgMgrOpts to when(len(ARGS["staging-dir"]) > 0,
9193
cat(" --installroot ", ARGS["staging-dir"]),

src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \
1717
libgcc \
1818
libssl3 \
1919
libstdc++ \
20-
tzdata
20+
tzdata \
21+
\
22+
# manually update zlib from alpine base image
23+
zlib
2124

2225
# Create a non-root user and group
2326
RUN addgroup \

src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \
1717
libgcc \
1818
libssl3 \
1919
libstdc++ \
20-
tzdata
20+
tzdata \
21+
\
22+
# manually update zlib from alpine base image
23+
zlib
2124

2225
# Create a non-root user and group
2326
RUN addgroup \

src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \
1717
libgcc \
1818
libssl3 \
1919
libstdc++ \
20-
tzdata
20+
tzdata \
21+
\
22+
# manually update zlib from alpine base image
23+
zlib
2124

2225
# Create a non-root user and group
2326
RUN addgroup \

src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \
1616
# .NET dependencies
1717
libgcc \
1818
libssl3 \
19-
libstdc++
19+
libstdc++ \
20+
\
21+
# manually update zlib from alpine base image
22+
zlib
2023

2124
# Create a non-root user and group
2225
RUN addgroup \

src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \
1616
# .NET dependencies
1717
libgcc \
1818
libssl3 \
19-
libstdc++
19+
libstdc++ \
20+
\
21+
# manually update zlib from alpine base image
22+
zlib
2023

2124
# Create a non-root user and group
2225
RUN addgroup \

src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \
1616
# .NET dependencies
1717
libgcc \
1818
libssl3 \
19-
libstdc++
19+
libstdc++ \
20+
\
21+
# manually update zlib from alpine base image
22+
zlib
2023

2124
# Create a non-root user and group
2225
RUN addgroup \

src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \
1717
libgcc \
1818
libssl3 \
1919
libstdc++ \
20-
tzdata
20+
tzdata \
21+
\
22+
# manually update zlib from alpine base image
23+
zlib
2124

2225
# Create a non-root user and group
2326
RUN addgroup \

src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \
1717
libgcc \
1818
libssl3 \
1919
libstdc++ \
20-
tzdata
20+
tzdata \
21+
\
22+
# manually update zlib from alpine base image
23+
zlib
2124

2225
# Create a non-root user and group
2326
RUN addgroup \

src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \
1717
libgcc \
1818
libssl3 \
1919
libstdc++ \
20-
tzdata
20+
tzdata \
21+
\
22+
# manually update zlib from alpine base image
23+
zlib
2124

2225
# Create a non-root user and group
2326
RUN addgroup \

0 commit comments

Comments
 (0)