Skip to content

Commit f9e988b

Browse files
athomasCommit Queue
authored andcommitted
Upgrade images to Debian trixie
Closes #240 GitOrigin-RevId: 4286211 Change-Id: Ib561d71fedf80da6dbf09b8f68ecd33689920c55 Reviewed-on: https://dart-review.googlesource.com/c/dart-docker/+/444580 Reviewed-by: Ivan Inozemtsev <[email protected]> Commit-Queue: Alexander Thomas <[email protected]>
1 parent 19c9389 commit f9e988b

File tree

7 files changed

+21
-23
lines changed

7 files changed

+21
-23
lines changed

Dockerfile-debian.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
RUN set -eux; \
44
apt-get update; \

beta/bookworm/Dockerfile renamed to beta/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
RUN set -eux; \
44
apt-get update; \

scripts/bin/update.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Future<void> update(
4040
final dockerfileContent = buildDockerfile(version, template);
4141
final dockerfile =
4242
(await fileSystem
43-
.directory('${version.channel}/bookworm')
43+
.directory('${version.channel}/trixie')
4444
.create(recursive: true))
4545
.childFile('Dockerfile');
4646
await dockerfile.writeAsString(dockerfileContent);

scripts/lib/src/library.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ String _imageData(Iterable<String> tags, String channel) =>
3131
3232
Tags: ${tags.join(', ')}
3333
Architectures: amd64, arm32v7, arm64v8
34-
Directory: $channel/bookworm
34+
Directory: $channel/trixie
3535
''';
3636

3737
/// Uses `git rev-parse HEAD` to get the hash of the current commit.

scripts/test/library_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ GitCommit: abcdef
3232
3333
Tags: 2.12.4-sdk, 2.12-sdk, 2-sdk, stable-sdk, sdk, 2.12.4, 2.12, 2, stable, latest
3434
Architectures: amd64, arm32v7, arm64v8
35-
Directory: stable/bookworm
35+
Directory: stable/trixie
3636
3737
Tags: 2.13.0-211.6.beta-sdk, beta-sdk, 2.13.0-211.6.beta, beta
3838
Architectures: amd64, arm32v7, arm64v8
39-
Directory: beta/bookworm
39+
Directory: beta/trixie
4040
''';
4141

4242
expect(library, expected);
@@ -59,7 +59,7 @@ GitCommit: abcdef
5959
6060
Tags: 2.13.0-sdk, 2.13-sdk, 2-sdk, stable-sdk, sdk, 2.13.0, 2.13, 2, stable, latest, beta-sdk, beta
6161
Architectures: amd64, arm32v7, arm64v8
62-
Directory: stable/bookworm
62+
Directory: stable/trixie
6363
''';
6464

6565
expect(library, expected);
@@ -87,7 +87,7 @@ GitCommit: abcdef
8787
8888
Tags: 2.13.0-sdk, 2.13-sdk, 2-sdk, stable-sdk, sdk, 2.13.0, 2.13, 2, stable, latest, beta-sdk, beta
8989
Architectures: amd64, arm32v7, arm64v8
90-
Directory: stable/bookworm
90+
Directory: stable/trixie
9191
''';
9292

9393
expect(library, expected);

scripts/test/update_test.dart

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void main() {
4040
var fileSystem = TestFileSystem.build({
4141
'versions.json': versions,
4242
'Dockerfile-debian.template': dockerfileTemplate,
43-
'beta/bookworm/Dockerfile': '',
43+
'beta/trixie/Dockerfile': '',
4444
});
4545

4646
await update.update(fileSystem.fileSystem, read, false);
@@ -49,8 +49,8 @@ void main() {
4949
'versions.json',
5050
'Dockerfile-debian.template',
5151
'versions.json',
52-
'beta/bookworm',
53-
'beta/bookworm/Dockerfile',
52+
'beta/trixie',
53+
'beta/trixie/Dockerfile',
5454
]);
5555
expect(fileSystem.operations, [
5656
FileSystemOp.read,
@@ -67,7 +67,7 @@ ENV DART_SHA256_ARM arm-sha
6767
ENV DART_SHA256_ARM64 arm64-sha
6868
''';
6969
expect(
70-
fileSystem.fileSystem.file('beta/bookworm/Dockerfile').readAsStringSync(),
70+
fileSystem.fileSystem.file('beta/trixie/Dockerfile').readAsStringSync(),
7171
expected,
7272
);
7373
});
@@ -83,12 +83,12 @@ ENV DART_SHA256_ARM64 arm64-sha
8383
var fileSystem = TestFileSystem.build({
8484
'versions.json': versions,
8585
'Dockerfile-debian.template': dockerfileTemplate,
86-
'stable/bookworm/Dockerfile': '''
86+
'stable/trixie/Dockerfile': '''
8787
ENV DART_CHANNEL bugged
8888
ENV DART_VERSION weird
8989
ENV DART_SHA256 off
9090
''',
91-
'beta/bookworm/Dockerfile': '''
91+
'beta/trixie/Dockerfile': '''
9292
ENV DART_CHANNEL outdated
9393
ENV DART_VERSION wrong
9494
ENV DART_SHA256 incorrect
@@ -101,10 +101,10 @@ ENV DART_SHA256 incorrect
101101
'versions.json',
102102
'Dockerfile-debian.template',
103103
'versions.json',
104-
'stable/bookworm',
105-
'stable/bookworm/Dockerfile',
106-
'beta/bookworm',
107-
'beta/bookworm/Dockerfile',
104+
'stable/trixie',
105+
'stable/trixie/Dockerfile',
106+
'beta/trixie',
107+
'beta/trixie/Dockerfile',
108108
]);
109109
expect(fileSystem.operations, [
110110
FileSystemOp.read,
@@ -123,7 +123,7 @@ ENV DART_SHA256_ARM opq
123123
ENV DART_SHA256_ARM64 rst
124124
''';
125125
expect(
126-
fileSystem.fileSystem.file('beta/bookworm/Dockerfile').readAsStringSync(),
126+
fileSystem.fileSystem.file('beta/trixie/Dockerfile').readAsStringSync(),
127127
expectedBeta,
128128
);
129129

@@ -135,9 +135,7 @@ ENV DART_SHA256_ARM def
135135
ENV DART_SHA256_ARM64 ghi
136136
''';
137137
expect(
138-
fileSystem.fileSystem
139-
.file('stable/bookworm/Dockerfile')
140-
.readAsStringSync(),
138+
fileSystem.fileSystem.file('stable/trixie/Dockerfile').readAsStringSync(),
141139
expectedStable,
142140
);
143141
});

stable/bookworm/Dockerfile renamed to stable/trixie/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
RUN set -eux; \
44
apt-get update; \

0 commit comments

Comments
 (0)