Skip to content

Commit 5bdb8ec

Browse files
authored
all: update to debian 13 (#24055) [publish images]
1 parent 4cf9b79 commit 5bdb8ec

File tree

10 files changed

+20
-21
lines changed

10 files changed

+20
-21
lines changed

.buildkite/ci.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ const testPlatforms = [
125125
{ os: "darwin", arch: "aarch64", release: "13", tier: "previous" },
126126
{ os: "darwin", arch: "x64", release: "14", tier: "latest" },
127127
{ os: "darwin", arch: "x64", release: "13", tier: "previous" },
128-
{ os: "linux", arch: "aarch64", distro: "debian", release: "12", tier: "latest" },
129-
{ os: "linux", arch: "x64", distro: "debian", release: "12", tier: "latest" },
130-
{ os: "linux", arch: "x64", baseline: true, distro: "debian", release: "12", tier: "latest" },
131-
{ os: "linux", arch: "x64", profile: "asan", distro: "debian", release: "12", tier: "latest" },
128+
{ os: "linux", arch: "aarch64", distro: "debian", release: "13", tier: "latest" },
129+
{ os: "linux", arch: "x64", distro: "debian", release: "13", tier: "latest" },
130+
{ os: "linux", arch: "x64", baseline: true, distro: "debian", release: "13", tier: "latest" },
131+
{ os: "linux", arch: "x64", profile: "asan", distro: "debian", release: "13", tier: "latest" },
132132
{ os: "linux", arch: "aarch64", distro: "ubuntu", release: "25.04", tier: "latest" },
133133
{ os: "linux", arch: "aarch64", distro: "ubuntu", release: "24.04", tier: "latest" },
134134
{ os: "linux", arch: "x64", distro: "ubuntu", release: "25.04", tier: "latest" },

dockerhub/debian-slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim AS build
1+
FROM debian:trixie-slim AS build
22

33
# https://github.com/oven-sh/bun/releases
44
ARG BUN_VERSION=latest
@@ -55,7 +55,7 @@ RUN apt-get update -qq \
5555
&& which bun \
5656
&& bun --version
5757

58-
FROM debian:bookworm-slim
58+
FROM debian:trixie-slim
5959

6060
# Disable the runtime transpiler cache by default inside Docker containers.
6161
# On ephemeral containers, the cache is not useful

dockerhub/debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim AS build
1+
FROM debian:trixie-slim AS build
22

33
# https://github.com/oven-sh/bun/releases
44
ARG BUN_VERSION=latest
@@ -56,7 +56,7 @@ RUN apt-get update -qq \
5656
&& rm -f "bun-linux-$build.zip" SHASUMS256.txt.asc SHASUMS256.txt \
5757
&& chmod +x /usr/local/bin/bun
5858

59-
FROM debian:bookworm
59+
FROM debian:trixie
6060

6161
COPY docker-entrypoint.sh /usr/local/bin
6262
COPY --from=build /usr/local/bin/bun /usr/local/bin/bun

dockerhub/distroless/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim AS build
1+
FROM debian:trixie-slim AS build
22

33
# https://github.com/oven-sh/bun/releases
44
ARG BUN_VERSION=latest
@@ -55,7 +55,7 @@ RUN apt-get update -qq \
5555
&& which bun \
5656
&& bun --version
5757

58-
FROM gcr.io/distroless/base-nossl-debian11
58+
FROM gcr.io/distroless/base-nossl-debian13
5959

6060
# Disable the runtime transpiler cache by default inside Docker containers.
6161
# On ephemeral containers, the cache is not useful

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"node:test:cp": "bun ./scripts/fetch-node-test.ts ",
8888
"clean:zig": "rm -rf build/debug/cache/zig build/debug/CMakeCache.txt 'build/debug/*.o' .zig-cache zig-out || true",
8989
"machine:linux:ubuntu": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=ubuntu --release=25.04",
90-
"machine:linux:debian": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=debian --release=12",
90+
"machine:linux:debian": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=debian --release=13",
9191
"machine:linux:alpine": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=alpine --release=3.22",
9292
"machine:linux:amazonlinux": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=linux --distro=amazonlinux --release=2023",
9393
"machine:windows:2019": "./scripts/machine.mjs ssh --cloud=aws --arch=x64 --instance-type c7i.2xlarge --os=windows --release=2019",

scripts/bootstrap.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# Version: 20
2+
# Version: 21
33

44
# A script that installs the dependencies needed to build and test Bun.
55
# This should work on macOS and Linux with a POSIX shell.
@@ -1766,7 +1766,7 @@ ensure_no_tmpfs() {
17661766
if ! [ "$os" = "linux" ]; then
17671767
return
17681768
fi
1769-
if ! [ "$distro" = "ubuntu" ]; then
1769+
if ! ( [ "$distro" = "ubuntu" ] || [ "$distro" = "debian" ] ); then
17701770
return
17711771
fi
17721772

scripts/utils.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2842,7 +2842,7 @@ export function printEnvironment() {
28422842

28432843
if (isCI) {
28442844
startGroup("Environment", () => {
2845-
for (const [key, value] of Object.entries(process.env)) {
2845+
for (const [key, value] of Object.entries(process.env).toSorted()) {
28462846
console.log(`${key}:`, value);
28472847
}
28482848
});

test/bundler/bun-build-compile-wasm.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ describe("Bun.build compile with wasm", () => {
1111
"app.js": `
1212
// Import a wasm module and properly instantiate it
1313
import wasmPath from "./test.wasm";
14-
14+
1515
async function main() {
1616
try {
1717
// Read the wasm file as ArrayBuffer
1818
const wasmBuffer = await Bun.file(wasmPath).arrayBuffer();
1919
const { instance } = await WebAssembly.instantiate(wasmBuffer);
20-
20+
2121
// Call the add function from wasm
2222
const result = instance.exports.add(2, 3);
2323
console.log("WASM result:", result);
24-
24+
2525
if (result === 5) {
2626
console.log("WASM module loaded successfully");
2727
process.exit(0);
@@ -34,7 +34,7 @@ describe("Bun.build compile with wasm", () => {
3434
process.exit(1);
3535
}
3636
}
37-
37+
3838
main();
3939
`,
4040
// A real WebAssembly module that exports an 'add' function

test/no-validate-leaksan.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ test/regression/issue/02499/02499.test.ts
193193
test/js/node/test/parallel/test-http-server-stale-close.js
194194
test/js/third_party/comlink/comlink.test.ts
195195
test/regression/issue/22635/22635.test.ts
196+
test/js/node/test/parallel/test-http-url.parse-https.request.js
196197

197198

198199
# Bun::JSNodeHTTPServerSocket::clearSocketData

test/preload.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ for (let key in process.env) {
1010

1111
for (let key in harness.bunEnv) {
1212
if (key === "TZ") continue;
13-
if (harness.bunEnv[key] === undefined) {
14-
continue;
15-
}
13+
if (harness.bunEnv[key] === undefined) continue;
1614
process.env[key] = harness.bunEnv[key] + "";
1715
}
1816

0 commit comments

Comments
 (0)