Skip to content

Commit d1c3b75

Browse files
conradgroblerconradgrobler
committed
Update the Oak Containers system image
Also updated the related NVIDIA system image, sysroot and app_base. Also fixed documentation, comments, a script and justfile. Change-Id: I7b6a083c5039fbf76fa09591afe9ca0f6a6a6964
1 parent 1fcd83c commit d1c3b75

9 files changed

Lines changed: 277 additions & 576 deletions

File tree

‎justfiles/containers.just‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ default:
33
@just --list containers
44

55
# Update and build the Oak Containers system image
6+
[working-directory: ".."]
67
system-image:
78
./oak_containers/system_image/base/build-base.sh vanilla
89

910
# Update and build the Oak Containers system image with nvidia GPU support
11+
[working-directory: ".."]
1012
nvidia-system-image:
1113
./oak_containers/system_image/base/build-base.sh nvidia
1214

@@ -22,8 +24,15 @@ sysroot-dev:
2224
bazel build sysroot-dev
2325
@printf "\nAbsolute Location:\n\n $(pwd)/bazel-bin/sysroot-dev.tar\n\n"
2426

27+
# Update the Oak Containers App base.
28+
[working-directory: ".."]
29+
app_base:
30+
bazel run @oak_containers_app_base//:lock
31+
32+
[working-directory: ".."]
2533
push-system-image:
2634
./oak_containers/system_image/base/push-base.sh vanilla
35+
[working-directory: ".."]
2736
push-nvidia-system-image:
2837
./oak_containers/system_image/base/push-base.sh nvidia
2938

‎oak_containers/app_base/app_base.lock.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,82 @@
44
"arch": "amd64",
55
"dependencies": [
66
{
7-
"key": "mawk_1.3.4.20200120-3.1_amd64",
7+
"key": "mawk_1.3.4.20250131-1_amd64",
88
"name": "mawk",
9-
"version": "1.3.4.20200120-3.1"
9+
"version": "1.3.4.20250131-1"
1010
},
1111
{
12-
"key": "libc6_2.36-9-p-deb12u7_amd64",
12+
"key": "libc6_2.41-12-p-deb13u2_amd64",
1313
"name": "libc6",
14-
"version": "2.36-9+deb12u7"
14+
"version": "2.41-12+deb13u2"
1515
},
1616
{
17-
"key": "libgcc-s1_12.2.0-14_amd64",
17+
"key": "libgcc-s1_14.2.0-19_amd64",
1818
"name": "libgcc-s1",
19-
"version": "12.2.0-14"
19+
"version": "14.2.0-19"
2020
},
2121
{
22-
"key": "gcc-12-base_12.2.0-14_amd64",
23-
"name": "gcc-12-base",
24-
"version": "12.2.0-14"
22+
"key": "gcc-14-base_14.2.0-19_amd64",
23+
"name": "gcc-14-base",
24+
"version": "14.2.0-19"
2525
}
2626
],
27-
"key": "base-files_12.4-p-deb12u5_amd64",
27+
"key": "base-files_13.8-p-deb13u4_amd64",
2828
"name": "base-files",
29-
"sha256": "6c11268757a89f45c22d7a7a9e1153f1545016987531bf3068765a221e0af86c",
29+
"sha256": "819e70a077c6b94d72c1385cc18a512446ded629499f7bb7d84d727977b67ad4",
3030
"urls": [
31-
"https://snapshot-cloudflare.debian.org/archive/debian/20240612T000000Z/pool/main/b/base-files/base-files_12.4+deb12u5_amd64.deb",
32-
"https://snapshot.debian.org/archive/debian/20240612T000000Z/pool/main/b/base-files/base-files_12.4+deb12u5_amd64.deb"
31+
"https://snapshot-cloudflare.debian.org/archive/debian/20260421T000000Z/pool/main/b/base-files/base-files_13.8+deb13u4_amd64.deb",
32+
"https://snapshot.debian.org/archive/debian/20260421T000000Z/pool/main/b/base-files/base-files_13.8+deb13u4_amd64.deb"
3333
],
34-
"version": "12.4+deb12u5"
34+
"version": "13.8+deb13u4"
3535
},
3636
{
3737
"arch": "amd64",
3838
"dependencies": [],
39-
"key": "mawk_1.3.4.20200120-3.1_amd64",
39+
"key": "mawk_1.3.4.20250131-1_amd64",
4040
"name": "mawk",
41-
"sha256": "bcbc83f391854ea9d50ce2a4101aacf330de3b8b71d81a798faadba14a157f78",
41+
"sha256": "ade14470c4dff8921bca6ca8b1ea20eadc0f2178b48caff3c74534b17a633292",
4242
"urls": [
43-
"https://snapshot-cloudflare.debian.org/archive/debian/20240612T000000Z/pool/main/m/mawk/mawk_1.3.4.20200120-3.1_amd64.deb",
44-
"https://snapshot.debian.org/archive/debian/20240612T000000Z/pool/main/m/mawk/mawk_1.3.4.20200120-3.1_amd64.deb"
43+
"https://snapshot-cloudflare.debian.org/archive/debian/20260421T000000Z/pool/main/m/mawk/mawk_1.3.4.20250131-1_amd64.deb",
44+
"https://snapshot.debian.org/archive/debian/20260421T000000Z/pool/main/m/mawk/mawk_1.3.4.20250131-1_amd64.deb"
4545
],
46-
"version": "1.3.4.20200120-3.1"
46+
"version": "1.3.4.20250131-1"
4747
},
4848
{
4949
"arch": "amd64",
5050
"dependencies": [],
51-
"key": "libc6_2.36-9-p-deb12u7_amd64",
51+
"key": "libc6_2.41-12-p-deb13u2_amd64",
5252
"name": "libc6",
53-
"sha256": "eba944bd99c2f5142baf573e6294a70f00758083bc3c2dca4c9e445943a3f8e6",
53+
"sha256": "8f9ddeb958cec3a05c4c303d4c85fddf30cb994747b16b1eb715ac49049f6d4a",
5454
"urls": [
55-
"https://snapshot-cloudflare.debian.org/archive/debian-security/20240612T000000Z/pool/updates/main/g/glibc/libc6_2.36-9+deb12u7_amd64.deb",
56-
"https://snapshot.debian.org/archive/debian-security/20240612T000000Z/pool/updates/main/g/glibc/libc6_2.36-9+deb12u7_amd64.deb"
55+
"https://snapshot-cloudflare.debian.org/archive/debian/20260421T000000Z/pool/main/g/glibc/libc6_2.41-12+deb13u2_amd64.deb",
56+
"https://snapshot.debian.org/archive/debian/20260421T000000Z/pool/main/g/glibc/libc6_2.41-12+deb13u2_amd64.deb"
5757
],
58-
"version": "2.36-9+deb12u7"
58+
"version": "2.41-12+deb13u2"
5959
},
6060
{
6161
"arch": "amd64",
6262
"dependencies": [],
63-
"key": "libgcc-s1_12.2.0-14_amd64",
63+
"key": "libgcc-s1_14.2.0-19_amd64",
6464
"name": "libgcc-s1",
65-
"sha256": "f3d1d48c0599aea85b7f2077a01d285badc42998c1a1e7473935d5cf995c8141",
65+
"sha256": "3c71917b490d1a17aed43196a2787a256ecf060526cdb20216a74bedc061b150",
6666
"urls": [
67-
"https://snapshot-cloudflare.debian.org/archive/debian/20240612T000000Z/pool/main/g/gcc-12/libgcc-s1_12.2.0-14_amd64.deb",
68-
"https://snapshot.debian.org/archive/debian/20240612T000000Z/pool/main/g/gcc-12/libgcc-s1_12.2.0-14_amd64.deb"
67+
"https://snapshot-cloudflare.debian.org/archive/debian/20260421T000000Z/pool/main/g/gcc-14/libgcc-s1_14.2.0-19_amd64.deb",
68+
"https://snapshot.debian.org/archive/debian/20260421T000000Z/pool/main/g/gcc-14/libgcc-s1_14.2.0-19_amd64.deb"
6969
],
70-
"version": "12.2.0-14"
70+
"version": "14.2.0-19"
7171
},
7272
{
7373
"arch": "amd64",
7474
"dependencies": [],
75-
"key": "gcc-12-base_12.2.0-14_amd64",
76-
"name": "gcc-12-base",
77-
"sha256": "1a03df5a57833d65b5bb08cfa19d50e76f29088dc9e64fb934af42d9023a0807",
75+
"key": "gcc-14-base_14.2.0-19_amd64",
76+
"name": "gcc-14-base",
77+
"sha256": "5b6825de4263824b78c4c51f6476414f3b4e89c2ab63e81dc8b9b5501e867cf6",
7878
"urls": [
79-
"https://snapshot-cloudflare.debian.org/archive/debian/20240612T000000Z/pool/main/g/gcc-12/gcc-12-base_12.2.0-14_amd64.deb",
80-
"https://snapshot.debian.org/archive/debian/20240612T000000Z/pool/main/g/gcc-12/gcc-12-base_12.2.0-14_amd64.deb"
79+
"https://snapshot-cloudflare.debian.org/archive/debian/20260421T000000Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_amd64.deb",
80+
"https://snapshot.debian.org/archive/debian/20260421T000000Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_amd64.deb"
8181
],
82-
"version": "12.2.0-14"
82+
"version": "14.2.0-19"
8383
}
8484
],
8585
"version": 1

‎oak_containers/app_base/app_base.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ version: 1
1818

1919
# Corresponding to the debian_snapshot version in
2020
# oak_containers/system_image/base/base_image.Dockerfile.
21-
# SHA256: 26878d0d3aa5e1980d6f8060b4af32fc48b8edeb1fc4d2d074a13a04b17c95f2
21+
# SHA256: 8f0c555de6a2f9c2bda1b170b67479d11f7f5e3b66bb4a7a1d8843361c9dd3ff
2222
sources:
23-
- channel: bookworm main
23+
- channel: trixie main
2424
urls:
25-
- https://snapshot-cloudflare.debian.org/archive/debian/20240612T000000Z
26-
- https://snapshot.debian.org/archive/debian/20240612T000000Z
27-
- channel: bookworm-security main
25+
- https://snapshot-cloudflare.debian.org/archive/debian/20260421T000000Z
26+
- https://snapshot.debian.org/archive/debian/20260421T000000Z
27+
- channel: trixie-security main
2828
urls:
29-
- https://snapshot-cloudflare.debian.org/archive/debian-security/20240612T000000Z
30-
- https://snapshot.debian.org/archive/debian-security/20240612T000000Z
29+
- https://snapshot-cloudflare.debian.org/archive/debian-security/20260421T000000Z
30+
- https://snapshot.debian.org/archive/debian-security/20260421T000000Z
3131
archs:
3232
- 'amd64'
3333

0 commit comments

Comments
 (0)