From 7eabf182adb13675ce2727551bdb7b5772a51e7b Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Mon, 11 Aug 2025 12:48:31 +0200 Subject: [PATCH] Upgrade base images to Debian trixie --- Dockerfile-debian.template | 2 +- beta/{bookworm => trixie}/Dockerfile | 2 +- scripts/bin/update.dart | 2 +- scripts/lib/src/library.dart | 2 +- scripts/test/library_test.dart | 8 ++++---- scripts/test/update_test.dart | 26 ++++++++++++-------------- stable/{bookworm => trixie}/Dockerfile | 2 +- 7 files changed, 21 insertions(+), 23 deletions(-) rename beta/{bookworm => trixie}/Dockerfile (99%) rename stable/{bookworm => trixie}/Dockerfile (99%) diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 2bedb0e..f07a502 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/beta/bookworm/Dockerfile b/beta/trixie/Dockerfile similarity index 99% rename from beta/bookworm/Dockerfile rename to beta/trixie/Dockerfile index 5e65b21..75a349b 100644 --- a/beta/bookworm/Dockerfile +++ b/beta/trixie/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/scripts/bin/update.dart b/scripts/bin/update.dart index 1ac5e82..cf3b875 100755 --- a/scripts/bin/update.dart +++ b/scripts/bin/update.dart @@ -40,7 +40,7 @@ Future update( final dockerfileContent = buildDockerfile(version, template); final dockerfile = (await fileSystem - .directory('${version.channel}/bookworm') + .directory('${version.channel}/trixie') .create(recursive: true)) .childFile('Dockerfile'); await dockerfile.writeAsString(dockerfileContent); diff --git a/scripts/lib/src/library.dart b/scripts/lib/src/library.dart index 4d6295b..8b39594 100644 --- a/scripts/lib/src/library.dart +++ b/scripts/lib/src/library.dart @@ -31,7 +31,7 @@ String _imageData(Iterable tags, String channel) => Tags: ${tags.join(', ')} Architectures: amd64, arm32v7, arm64v8 -Directory: $channel/bookworm +Directory: $channel/trixie '''; /// Uses `git rev-parse HEAD` to get the hash of the current commit. diff --git a/scripts/test/library_test.dart b/scripts/test/library_test.dart index d009ad8..06ebaeb 100644 --- a/scripts/test/library_test.dart +++ b/scripts/test/library_test.dart @@ -32,11 +32,11 @@ GitCommit: abcdef Tags: 2.12.4-sdk, 2.12-sdk, 2-sdk, stable-sdk, sdk, 2.12.4, 2.12, 2, stable, latest Architectures: amd64, arm32v7, arm64v8 -Directory: stable/bookworm +Directory: stable/trixie Tags: 2.13.0-211.6.beta-sdk, beta-sdk, 2.13.0-211.6.beta, beta Architectures: amd64, arm32v7, arm64v8 -Directory: beta/bookworm +Directory: beta/trixie '''; expect(library, expected); @@ -59,7 +59,7 @@ GitCommit: abcdef Tags: 2.13.0-sdk, 2.13-sdk, 2-sdk, stable-sdk, sdk, 2.13.0, 2.13, 2, stable, latest, beta-sdk, beta Architectures: amd64, arm32v7, arm64v8 -Directory: stable/bookworm +Directory: stable/trixie '''; expect(library, expected); @@ -87,7 +87,7 @@ GitCommit: abcdef Tags: 2.13.0-sdk, 2.13-sdk, 2-sdk, stable-sdk, sdk, 2.13.0, 2.13, 2, stable, latest, beta-sdk, beta Architectures: amd64, arm32v7, arm64v8 -Directory: stable/bookworm +Directory: stable/trixie '''; expect(library, expected); diff --git a/scripts/test/update_test.dart b/scripts/test/update_test.dart index 9bfa386..af53a40 100644 --- a/scripts/test/update_test.dart +++ b/scripts/test/update_test.dart @@ -40,7 +40,7 @@ void main() { var fileSystem = TestFileSystem.build({ 'versions.json': versions, 'Dockerfile-debian.template': dockerfileTemplate, - 'beta/bookworm/Dockerfile': '', + 'beta/trixie/Dockerfile': '', }); await update.update(fileSystem.fileSystem, read, false); @@ -49,8 +49,8 @@ void main() { 'versions.json', 'Dockerfile-debian.template', 'versions.json', - 'beta/bookworm', - 'beta/bookworm/Dockerfile', + 'beta/trixie', + 'beta/trixie/Dockerfile', ]); expect(fileSystem.operations, [ FileSystemOp.read, @@ -67,7 +67,7 @@ ENV DART_SHA256_ARM arm-sha ENV DART_SHA256_ARM64 arm64-sha '''; expect( - fileSystem.fileSystem.file('beta/bookworm/Dockerfile').readAsStringSync(), + fileSystem.fileSystem.file('beta/trixie/Dockerfile').readAsStringSync(), expected, ); }); @@ -83,12 +83,12 @@ ENV DART_SHA256_ARM64 arm64-sha var fileSystem = TestFileSystem.build({ 'versions.json': versions, 'Dockerfile-debian.template': dockerfileTemplate, - 'stable/bookworm/Dockerfile': ''' + 'stable/trixie/Dockerfile': ''' ENV DART_CHANNEL bugged ENV DART_VERSION weird ENV DART_SHA256 off ''', - 'beta/bookworm/Dockerfile': ''' + 'beta/trixie/Dockerfile': ''' ENV DART_CHANNEL outdated ENV DART_VERSION wrong ENV DART_SHA256 incorrect @@ -101,10 +101,10 @@ ENV DART_SHA256 incorrect 'versions.json', 'Dockerfile-debian.template', 'versions.json', - 'stable/bookworm', - 'stable/bookworm/Dockerfile', - 'beta/bookworm', - 'beta/bookworm/Dockerfile', + 'stable/trixie', + 'stable/trixie/Dockerfile', + 'beta/trixie', + 'beta/trixie/Dockerfile', ]); expect(fileSystem.operations, [ FileSystemOp.read, @@ -123,7 +123,7 @@ ENV DART_SHA256_ARM opq ENV DART_SHA256_ARM64 rst '''; expect( - fileSystem.fileSystem.file('beta/bookworm/Dockerfile').readAsStringSync(), + fileSystem.fileSystem.file('beta/trixie/Dockerfile').readAsStringSync(), expectedBeta, ); @@ -135,9 +135,7 @@ ENV DART_SHA256_ARM def ENV DART_SHA256_ARM64 ghi '''; expect( - fileSystem.fileSystem - .file('stable/bookworm/Dockerfile') - .readAsStringSync(), + fileSystem.fileSystem.file('stable/trixie/Dockerfile').readAsStringSync(), expectedStable, ); }); diff --git a/stable/bookworm/Dockerfile b/stable/trixie/Dockerfile similarity index 99% rename from stable/bookworm/Dockerfile rename to stable/trixie/Dockerfile index d0ccfba..75aa77b 100644 --- a/stable/bookworm/Dockerfile +++ b/stable/trixie/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \