Skip to content

Commit a53e3a0

Browse files
loosebazookaloosebazooka
authored
Merge pull request #1933 from rinsuki/fix/debian13-ssl
fix: Add zlib/libzstd to base-debian13 image
2 parents 0b26035 + fe88732 commit a53e3a0

File tree

6 files changed

+121
-59
lines changed

6 files changed

+121
-59
lines changed

‎MODULE.bazel.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎base/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ of the packages in `gcr.io/distroless/static`, and
2121

2222
* glibc
2323
* libssl
24+
* for Debian 13 or later, libssl dependencies (zlib, libzstd) are also included.
25+
26+
Note: Debian 13 base image does not include [OpenSSL legacy algorithms](https://docs.openssl.org/3.5/man7/OSSL_PROVIDER-legacy/#operations-and-algorithms).
27+
28+
If you want to use them, you will need to add `openssl-legacy-provider` yourself.
2429

2530
## Usage
2631

‎base/config.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ BASE_PACKAGES = {
1212
"debian13": [
1313
"libc6",
1414
"libssl3t64",
15+
"libzstd1",
16+
"zlib1g",
1517
],
1618
}
1719

‎cc/config.bzl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ CC_PACKAGES = {
1616
"libstdc++6",
1717
"libgcc-s1",
1818
"gcc-14-base",
19-
"zlib1g",
2019
],
2120
}

‎private/repos/deb/trixie.lock.json‎

Lines changed: 110 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,28 @@
9999
],
100100
"version": "13.0.0"
101101
},
102+
{
103+
"arch": "amd64",
104+
"dependencies": [],
105+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_amd64",
106+
"name": "zlib1g",
107+
"sha256": "015be740d6236ad114582dea500c1d907f29e16d6db00566ca32fb68d71ac90d",
108+
"urls": [
109+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_amd64.deb"
110+
],
111+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
112+
},
113+
{
114+
"arch": "amd64",
115+
"dependencies": [],
116+
"key": "libzstd1_1.5.7-p-dfsg-1_amd64",
117+
"name": "libzstd1",
118+
"sha256": "2f6a2aeacfc925eba8b00ac9139bc4bfccf8cacb09eb93de067074b26948eef9",
119+
"urls": [
120+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/libz/libzstd/libzstd1_1.5.7+dfsg-1_amd64.deb"
121+
],
122+
"version": "1.5.7+dfsg-1"
123+
},
102124
{
103125
"arch": "amd64",
104126
"dependencies": [],
@@ -143,17 +165,6 @@
143165
],
144166
"version": "14.2.0-19"
145167
},
146-
{
147-
"arch": "amd64",
148-
"dependencies": [],
149-
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_amd64",
150-
"name": "zlib1g",
151-
"sha256": "015be740d6236ad114582dea500c1d907f29e16d6db00566ca32fb68d71ac90d",
152-
"urls": [
153-
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_amd64.deb"
154-
],
155-
"version": "1:1.3.dfsg+really1.3.1-1+b1"
156-
},
157168
{
158169
"arch": "arm64",
159170
"dependencies": [],
@@ -253,6 +264,28 @@
253264
],
254265
"version": "13.0.0"
255266
},
267+
{
268+
"arch": "arm64",
269+
"dependencies": [],
270+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_arm64",
271+
"name": "zlib1g",
272+
"sha256": "209aa5cf671e97b9eb0410844fa6df4cae2e75b0c72e7802ab6c8ece13e6ddef",
273+
"urls": [
274+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_arm64.deb"
275+
],
276+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
277+
},
278+
{
279+
"arch": "arm64",
280+
"dependencies": [],
281+
"key": "libzstd1_1.5.7-p-dfsg-1_arm64",
282+
"name": "libzstd1",
283+
"sha256": "924540bd59fdbfa77a0604360efdaca54411a43daf11c7e002a3c64791b67448",
284+
"urls": [
285+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/libz/libzstd/libzstd1_1.5.7+dfsg-1_arm64.deb"
286+
],
287+
"version": "1.5.7+dfsg-1"
288+
},
256289
{
257290
"arch": "arm64",
258291
"dependencies": [],
@@ -297,17 +330,6 @@
297330
],
298331
"version": "14.2.0-19"
299332
},
300-
{
301-
"arch": "arm64",
302-
"dependencies": [],
303-
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_arm64",
304-
"name": "zlib1g",
305-
"sha256": "209aa5cf671e97b9eb0410844fa6df4cae2e75b0c72e7802ab6c8ece13e6ddef",
306-
"urls": [
307-
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_arm64.deb"
308-
],
309-
"version": "1:1.3.dfsg+really1.3.1-1+b1"
310-
},
311333
{
312334
"arch": "armhf",
313335
"dependencies": [],
@@ -407,6 +429,28 @@
407429
],
408430
"version": "13.0.0"
409431
},
432+
{
433+
"arch": "armhf",
434+
"dependencies": [],
435+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_armhf",
436+
"name": "zlib1g",
437+
"sha256": "81c55a59e1570477ecef6a449bf6dce44dad67ba4ce9e04760451d4cfe200534",
438+
"urls": [
439+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_armhf.deb"
440+
],
441+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
442+
},
443+
{
444+
"arch": "armhf",
445+
"dependencies": [],
446+
"key": "libzstd1_1.5.7-p-dfsg-1_armhf",
447+
"name": "libzstd1",
448+
"sha256": "da5238dd84fc51f782f39d435821bff556409b3dbc82d232e4e81f427fb1ca65",
449+
"urls": [
450+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/libz/libzstd/libzstd1_1.5.7+dfsg-1_armhf.deb"
451+
],
452+
"version": "1.5.7+dfsg-1"
453+
},
410454
{
411455
"arch": "armhf",
412456
"dependencies": [],
@@ -451,17 +495,6 @@
451495
],
452496
"version": "14.2.0-19"
453497
},
454-
{
455-
"arch": "armhf",
456-
"dependencies": [],
457-
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_armhf",
458-
"name": "zlib1g",
459-
"sha256": "81c55a59e1570477ecef6a449bf6dce44dad67ba4ce9e04760451d4cfe200534",
460-
"urls": [
461-
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_armhf.deb"
462-
],
463-
"version": "1:1.3.dfsg+really1.3.1-1+b1"
464-
},
465498
{
466499
"arch": "s390x",
467500
"dependencies": [],
@@ -561,6 +594,28 @@
561594
],
562595
"version": "13.0.0"
563596
},
597+
{
598+
"arch": "s390x",
599+
"dependencies": [],
600+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_s390x",
601+
"name": "zlib1g",
602+
"sha256": "e38a94c60e944dfcf1937a12b02785afbbb2bedf356da18984c4dac0acc47ed9",
603+
"urls": [
604+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_s390x.deb"
605+
],
606+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
607+
},
608+
{
609+
"arch": "s390x",
610+
"dependencies": [],
611+
"key": "libzstd1_1.5.7-p-dfsg-1_s390x",
612+
"name": "libzstd1",
613+
"sha256": "ed6bd13718360720b0a03d62e2440bd926b1db3b7443f46314fe3deb7e69989e",
614+
"urls": [
615+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/libz/libzstd/libzstd1_1.5.7+dfsg-1_s390x.deb"
616+
],
617+
"version": "1.5.7+dfsg-1"
618+
},
564619
{
565620
"arch": "s390x",
566621
"dependencies": [],
@@ -605,17 +660,6 @@
605660
],
606661
"version": "14.2.0-19"
607662
},
608-
{
609-
"arch": "s390x",
610-
"dependencies": [],
611-
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_s390x",
612-
"name": "zlib1g",
613-
"sha256": "e38a94c60e944dfcf1937a12b02785afbbb2bedf356da18984c4dac0acc47ed9",
614-
"urls": [
615-
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_s390x.deb"
616-
],
617-
"version": "1:1.3.dfsg+really1.3.1-1+b1"
618-
},
619663
{
620664
"arch": "ppc64el",
621665
"dependencies": [],
@@ -715,6 +759,28 @@
715759
],
716760
"version": "13.0.0"
717761
},
762+
{
763+
"arch": "ppc64el",
764+
"dependencies": [],
765+
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_ppc64el",
766+
"name": "zlib1g",
767+
"sha256": "f526e830310db11983cf51cfde95a74bc449a7bdc44b6ce68827d78802f1b4ae",
768+
"urls": [
769+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_ppc64el.deb"
770+
],
771+
"version": "1:1.3.dfsg+really1.3.1-1+b1"
772+
},
773+
{
774+
"arch": "ppc64el",
775+
"dependencies": [],
776+
"key": "libzstd1_1.5.7-p-dfsg-1_ppc64el",
777+
"name": "libzstd1",
778+
"sha256": "1cdefa11a7d31bb36b610d4e44551870a44dfc6cac8359ebe9f9061a4f830773",
779+
"urls": [
780+
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/libz/libzstd/libzstd1_1.5.7+dfsg-1_ppc64el.deb"
781+
],
782+
"version": "1.5.7+dfsg-1"
783+
},
718784
{
719785
"arch": "ppc64el",
720786
"dependencies": [],
@@ -758,17 +824,6 @@
758824
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/g/gcc-14/libstdc++6_14.2.0-19_ppc64el.deb"
759825
],
760826
"version": "14.2.0-19"
761-
},
762-
{
763-
"arch": "ppc64el",
764-
"dependencies": [],
765-
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_ppc64el",
766-
"name": "zlib1g",
767-
"sha256": "f526e830310db11983cf51cfde95a74bc449a7bdc44b6ce68827d78802f1b4ae",
768-
"urls": [
769-
"https://snapshot.debian.org/archive/debian/20251115T203127Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_ppc64el.deb"
770-
],
771-
"version": "1:1.3.dfsg+really1.3.1-1+b1"
772827
}
773828
],
774829
"version": 1

‎private/repos/deb/trixie.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ packages:
2626
- openssl
2727
- tzdata
2828
- media-types
29+
- zlib1g
30+
- libzstd1
2931
# c++
3032
- gcc-14-base
3133
- libgcc-s1
3234
- libgomp1
3335
- libstdc++6
34-
- zlib1g

0 commit comments

Comments
 (0)