Skip to content

Upgrade images to Debian trixie #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Upgrade images to Debian trixie #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand Down
2 changes: 1 addition & 1 deletion beta/bookworm/Dockerfile → beta/trixie/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand Down
2 changes: 1 addition & 1 deletion scripts/bin/update.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Future<void> 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);
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/src/library.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ String _imageData(Iterable<String> 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.
Expand Down
8 changes: 4 additions & 4 deletions scripts/test/library_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
26 changes: 12 additions & 14 deletions scripts/test/update_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand All @@ -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,
);
});
Expand All @@ -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
Expand All @@ -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,
Expand All @@ -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,
);

Expand All @@ -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,
);
});
Expand Down
2 changes: 1 addition & 1 deletion stable/bookworm/Dockerfile → stable/trixie/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand Down
Loading