mkosi: fix Fedora GPG key issue in mkosi build

Fedora 30 is EOL. Attempt to bump to F40. Signed-off-by: Beraldo Leal <bleal@redhat.com>
confidential-containers · Feb 20, 2025 · 293e321 · 293e321
1 parent 9bf4cce
commit 293e321
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/cloud-api-adaptor/podvm-mkosi/Dockerfile.mkosi b/src/cloud-api-adaptor/podvm-mkosi/Dockerfile.mkosi
@@ -24,7 +24,7 @@ COPY mkosi.skeleton-debug /image/mkosi.skeleton-debug
 COPY mkosi.workspace /image/mkosi.workspace
 COPY resources /image/resources
 COPY mkosi.conf /image/mkosi.conf
-RUN --security=insecure mkosi --tools-tree=default --profile=$PROFILE
+RUN --security=insecure mkosi --tools-tree=default --tools-tree-release=40 --profile=$PROFILE
 
 FROM scratch
 COPY --from=builder /image/build/system.raw /
diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/initrd/mkosi.conf.d/fedora.conf b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/initrd/mkosi.conf.d/fedora.conf
@@ -3,7 +3,7 @@ Distribution=fedora
 
 [Distribution]
 Distribution=fedora
-Release=39
+Release=40
 
 [Content]
 CleanPackageMetadata=true

diff --git a/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora.conf b/src/cloud-api-adaptor/podvm-mkosi/mkosi.presets/system/mkosi.conf.d/fedora.conf
@@ -3,7 +3,7 @@ Distribution=fedora
 
 [Distribution]
 Distribution=fedora
-Release=39
+Release=40
 
 [Content]
 CleanPackageMetadata=true