move to later runtime deps image

Author: Mpdreamz

.github/workflows/ci.yml

@@ -95,6 +95,10 @@ jobs:
 
       - name: Publish AOT
         run: dotnet run --project build -c release -- publishbinaries
+        
+      - name: Publish Containers
+        if: ${{ matrix.os == 'ubuntu-latest' }} 
+        run: dotnet run --project build -c release -- publishcontainers
 
   integration:
     if: false

.github/workflows/release.yml

@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish Containers
-        run: ./build.sh publishcontainers\
+        run: ./build.sh publishcontainers
 
   build-lambda:
     needs: 

build/Targets.fs

@@ -77,32 +77,40 @@ let private publishZip _ =
 let private publishContainers _ =
 
     let createImage project =
+        let ci = Environment.environVarOrNone "GITHUB_ACTIONS"
+        let pr =
+            match Environment.environVarOrNone "GITHUB_REF_NAME" with
+            | None -> None 
+            | Some s when s.EndsWith "/merge"  -> Some (s.Split('/') |> Seq.head)
+            | _ -> None
         let imageTag =
             match project with
-            | "docs-builder" -> "jammy-chiseled-aot"
-            | _ -> "jammy-chiseled-aot"
+            | _ -> "9.0-noble-chiseled-aot"
         let labels =
             let exitCode = exec {
                 validExitCode (fun _ -> true)
                 exit_code_of "git" "describe" "--tags" "--exact-match" "HEAD"
             }
-            match exitCode with | 0 -> "edge;latest" | _ -> "edge"
+            match (exitCode, pr) with
+            | 0, _ -> "edge;latest"
+            | _, None -> "edge"
+            | _, Some pr -> $"ci-%s{pr}"
         let args =
             ["publish"; $"src/tooling/%s{project}/%s{project}.csproj"]
             @ [
                 "/t:PublishContainer";
                 "-p"; "DebugType=none";
-                "-p"; $"ContainerBaseImage=mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-%s{imageTag}";
+                "-p"; $"ContainerBaseImage=mcr.microsoft.com/dotnet/nightly/runtime-deps:%s{imageTag}";
                 "-p"; $"ContainerImageTags=\"%s{labels};%s{Software.Version.Normalize()}\""
                 "-p"; $"ContainerRepository=elastic/%s{project}"
             ]
         let registry =
-            match Environment.environVarOrNone "GITHUB_ACTIONS" with
-            | None -> []
-            | Some _ -> [
-                "-p"; "ContainerRegistry=ghcr.io"
-                "-p"; "ContainerUser=1001:1001";
-            ]
+            match (ci, pr) with
+            | Some _, None -> [
+                    "-p"; "ContainerRegistry=ghcr.io"
+                    "-p"; "ContainerUser=1001:1001";
+                ]
+            | _, _ -> []
         exec { run "dotnet" (args @ registry) }
     createImage "docs-builder"
     createImage "docs-assembler"