Skip to content

Commit 005005e

Browse files
dmeijboomdmeijboom
authored
Merge pull request #15 from brainpodnl/feat/update-php-versions
Update php versions
2 parents f4d210c + 5913cbd commit 005005e

16 files changed

Lines changed: 18876 additions & 17980 deletions

‎MODULE.bazel.lock‎

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

‎README.md‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# distroless-php
2+
3+
Distroless PHP images built with Bazel, using [rules_distroless](https://github.com/GoogleContainerTools/rules_distroless).
4+
5+
## Updating Debian package snapshots
6+
7+
The YAML manifests pin Debian packages to a specific [snapshot.debian.org](https://snapshot.debian.org) timestamp for reproducibility. When snapshots expire or return 404s, you need to update the timestamps and regenerate the lock files.
8+
9+
### 1. Find a recent snapshot timestamp
10+
11+
Browse the available snapshots:
12+
13+
- Debian archive: https://snapshot.debian.org/archive/debian/
14+
- Debian security: https://snapshot.debian.org/archive/debian-security/
15+
16+
Pick a recent timestamp (e.g. `20260210T022610Z`).
17+
18+
### 2. Update the YAML manifests
19+
20+
Replace the snapshot URLs in all manifest files:
21+
22+
- `php/common.yaml`
23+
- `php/wkhtmltopdf.yaml`
24+
- `php/7.2/php.yaml`
25+
- `php/7.4/php.yaml`
26+
- `php/8.3/php.yaml`
27+
- `php/8.4/php.yaml`
28+
- `nginx/bookworm.yaml`
29+
30+
Each file has three Debian snapshot sources to update:
31+
32+
```yaml
33+
sources:
34+
- channel: bookworm main contrib
35+
url: https://snapshot.debian.org/archive/debian/<TIMESTAMP>
36+
- channel: bookworm-security main
37+
url: https://snapshot.debian.org/archive/debian-security/<TIMESTAMP>
38+
- channel: bookworm-updates main
39+
url: https://snapshot.debian.org/archive/debian/<TIMESTAMP>
40+
```
41+
42+
### 3. Regenerate the lock files
43+
44+
Run the lock target for each repository:
45+
46+
```sh
47+
bazel run @php-common//:lock
48+
bazel run @php-wkhtmltopdf//:lock
49+
bazel run @php-7.2//:lock
50+
bazel run @php-7.4//:lock
51+
bazel run @php-8.3//:lock
52+
bazel run @php-8.4//:lock
53+
bazel run @nginx-bookworm//:lock
54+
```
55+
56+
This resolves packages from the new snapshots and writes updated `.lock.json` files.

‎nginx/bookworm.lock.json‎

Lines changed: 54 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,34 @@
33
{
44
"arch": "amd64",
55
"dependencies": [],
6-
"key": "nginx_1.22.1-9_amd64",
6+
"key": "nginx_1.22.1-9-p-deb12u3_amd64",
77
"name": "nginx",
8-
"sha256": "2916d7fc95b33a9df9ffb984e4c05d7a6f4fe3abb950b9127f0ad9a4adbd88aa",
9-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/n/nginx/nginx_1.22.1-9_amd64.deb",
10-
"version": "1.22.1-9"
8+
"sha256": "cba42902e1c113fdadfdd45dd33e55a42771bdbfc072e774612234782bdc0aae",
9+
"urls": [
10+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/n/nginx/nginx_1.22.1-9+deb12u3_amd64.deb"
11+
],
12+
"version": "1.22.1-9+deb12u3"
1113
},
1214
{
1315
"arch": "amd64",
1416
"dependencies": [],
15-
"key": "libc6_2.36-9-p-deb12u9_amd64",
17+
"key": "libc6_2.36-9-p-deb12u13_amd64",
1618
"name": "libc6",
17-
"sha256": "3a043b9dbf1a8c8b5a9e2268253e6dca8c7d431bd7a202fea96364abf374fea9",
18-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/g/glibc/libc6_2.36-9+deb12u9_amd64.deb",
19-
"version": "2.36-9+deb12u9"
19+
"sha256": "3d8072c73b017e907bbf44b7db870687888a991961d74f1ecbba6b9458f32a2c",
20+
"urls": [
21+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/g/glibc/libc6_2.36-9+deb12u13_amd64.deb"
22+
],
23+
"version": "2.36-9+deb12u13"
2024
},
2125
{
2226
"arch": "amd64",
2327
"dependencies": [],
2428
"key": "libcrypt1_1-4.4.33-2_amd64",
2529
"name": "libcrypt1",
2630
"sha256": "f5f60a5cdfd4e4eaa9438ade5078a57741a7a78d659fcb0c701204f523e8bd29",
27-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/libx/libxcrypt/libcrypt1_4.4.33-2_amd64.deb",
31+
"urls": [
32+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/libx/libxcrypt/libcrypt1_4.4.33-2_amd64.deb"
33+
],
2834
"version": "1:4.4.33-2"
2935
},
3036
{
@@ -33,52 +39,64 @@
3339
"key": "libpcre2-8-0_10.42-1_amd64",
3440
"name": "libpcre2-8-0",
3541
"sha256": "030db54f4d76cdfe2bf0e8eb5f9efea0233ab3c7aa942d672c7b63b52dbaf935",
36-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/p/pcre2/libpcre2-8-0_10.42-1_amd64.deb",
42+
"urls": [
43+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/p/pcre2/libpcre2-8-0_10.42-1_amd64.deb"
44+
],
3745
"version": "10.42-1"
3846
},
3947
{
4048
"arch": "amd64",
4149
"dependencies": [],
42-
"key": "libssl3_3.0.15-1_deb12u1_amd64",
50+
"key": "libssl3_3.0.18-1_deb12u2_amd64",
4351
"name": "libssl3",
44-
"sha256": "d7897e6c55a8d9e229dcf16b0b1d472d7f7be741b2b3b2ac624908ff63215a93",
45-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/o/openssl/libssl3_3.0.15-1~deb12u1_amd64.deb",
46-
"version": "3.0.15-1~deb12u1"
52+
"sha256": "ed44f11b74763cded2ad406f4de4d585ea27b0ce6377e7c8d98c2ddf2ed35cb3",
53+
"urls": [
54+
"https://snapshot.debian.org/archive/debian-security/20260209T193433Z/pool/updates/main/o/openssl/libssl3_3.0.18-1~deb12u2_amd64.deb"
55+
],
56+
"version": "3.0.18-1~deb12u2"
4757
},
4858
{
4959
"arch": "amd64",
5060
"dependencies": [],
5161
"key": "zlib1g_1-1.2.13.dfsg-1_amd64",
5262
"name": "zlib1g",
5363
"sha256": "d7dd1d1411fedf27f5e27650a6eff20ef294077b568f4c8c5e51466dc7c08ce4",
54-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/z/zlib/zlib1g_1.2.13.dfsg-1_amd64.deb",
64+
"urls": [
65+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/z/zlib/zlib1g_1.2.13.dfsg-1_amd64.deb"
66+
],
5567
"version": "1:1.2.13.dfsg-1"
5668
},
5769
{
5870
"arch": "arm64",
5971
"dependencies": [],
60-
"key": "nginx_1.22.1-9_arm64",
72+
"key": "nginx_1.22.1-9-p-deb12u3_arm64",
6173
"name": "nginx",
62-
"sha256": "eaefeb0a9c1d1cd8022ecc9a5977eecba063b3674c37fb600e4486e6140f6e11",
63-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/n/nginx/nginx_1.22.1-9_arm64.deb",
64-
"version": "1.22.1-9"
74+
"sha256": "8e5af919283a233315125e97e179240460b6076ba695c7ef766619ff6c2eb06f",
75+
"urls": [
76+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/n/nginx/nginx_1.22.1-9+deb12u3_arm64.deb"
77+
],
78+
"version": "1.22.1-9+deb12u3"
6579
},
6680
{
6781
"arch": "arm64",
6882
"dependencies": [],
69-
"key": "libc6_2.36-9-p-deb12u9_arm64",
83+
"key": "libc6_2.36-9-p-deb12u13_arm64",
7084
"name": "libc6",
71-
"sha256": "564ad8beb7d6d80620ed5f6387cd0da5e3bc839e0c43293b4233678e8366c283",
72-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/g/glibc/libc6_2.36-9+deb12u9_arm64.deb",
73-
"version": "2.36-9+deb12u9"
85+
"sha256": "03c3909c47a6df9f6f05357474efefca9bc30212069135a7c354fa78a1ec2415",
86+
"urls": [
87+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/g/glibc/libc6_2.36-9+deb12u13_arm64.deb"
88+
],
89+
"version": "2.36-9+deb12u13"
7490
},
7591
{
7692
"arch": "arm64",
7793
"dependencies": [],
7894
"key": "libcrypt1_1-4.4.33-2_arm64",
7995
"name": "libcrypt1",
8096
"sha256": "eea0ad76ea5eb507127fea0c291622ea4ecdbb71c4b9a8ed9c76ae33fc1a0127",
81-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/libx/libxcrypt/libcrypt1_4.4.33-2_arm64.deb",
97+
"urls": [
98+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/libx/libxcrypt/libcrypt1_4.4.33-2_arm64.deb"
99+
],
82100
"version": "1:4.4.33-2"
83101
},
84102
{
@@ -87,25 +105,31 @@
87105
"key": "libpcre2-8-0_10.42-1_arm64",
88106
"name": "libpcre2-8-0",
89107
"sha256": "b2448d0a8a3db7fbeac231e7ef93811346c1fb5f96ccf6f631701d8a4eb39206",
90-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/p/pcre2/libpcre2-8-0_10.42-1_arm64.deb",
108+
"urls": [
109+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/p/pcre2/libpcre2-8-0_10.42-1_arm64.deb"
110+
],
91111
"version": "10.42-1"
92112
},
93113
{
94114
"arch": "arm64",
95115
"dependencies": [],
96-
"key": "libssl3_3.0.15-1_deb12u1_arm64",
116+
"key": "libssl3_3.0.18-1_deb12u2_arm64",
97117
"name": "libssl3",
98-
"sha256": "468debe7aad7bd73592dcdbdab4d778558a4f538efd1b960f24e343fdbc0654d",
99-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/o/openssl/libssl3_3.0.15-1~deb12u1_arm64.deb",
100-
"version": "3.0.15-1~deb12u1"
118+
"sha256": "30b2d6c27fd4a2f5ef554ac3b86c96e8a3abbbfb454c6dbe7e308ce9df36f8c5",
119+
"urls": [
120+
"https://snapshot.debian.org/archive/debian-security/20260209T193433Z/pool/updates/main/o/openssl/libssl3_3.0.18-1~deb12u2_arm64.deb"
121+
],
122+
"version": "3.0.18-1~deb12u2"
101123
},
102124
{
103125
"arch": "arm64",
104126
"dependencies": [],
105127
"key": "zlib1g_1-1.2.13.dfsg-1_arm64",
106128
"name": "zlib1g",
107129
"sha256": "52b8b8a145bbe1956bba82034f77022cbef0c3d0885c9e32d9817a7932fe1913",
108-
"url": "https://snapshot.debian.org/archive/debian/20241211T143334Z/pool/main/z/zlib/zlib1g_1.2.13.dfsg-1_arm64.deb",
130+
"urls": [
131+
"https://snapshot.debian.org/archive/debian/20260210T022610Z/pool/main/z/zlib/zlib1g_1.2.13.dfsg-1_arm64.deb"
132+
],
109133
"version": "1:1.2.13.dfsg-1"
110134
}
111135
],

‎nginx/bookworm.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ version: 1
22

33
sources:
44
- channel: bookworm main contrib
5-
url: https://snapshot.debian.org/archive/debian/20241211T143334Z
5+
url: https://snapshot.debian.org/archive/debian/20260210T022610Z
66
- channel: bookworm-security main
7-
url: https://snapshot.debian.org/archive/debian-security/20241211T143334Z
7+
url: https://snapshot.debian.org/archive/debian-security/20260209T193433Z
88
- channel: bookworm-updates main
9-
url: https://snapshot.debian.org/archive/debian/20241211T143334Z
9+
url: https://snapshot.debian.org/archive/debian/20260210T022610Z
1010

1111
archs:
1212
- "amd64"

0 commit comments

Comments
 (0)