Enable streaming of build logs

src/main/groovy/io/seqera/wave/controller/ViewController.groovy

@@ -71,6 +71,8 @@ class ViewController {
         final binding = new HashMap(20)
         binding.build_id = result.buildId
         binding.build_success = result.succeeded()
+        binding.build_failed = result.exitStatus  && result.exitStatus != 0
+        binding.build_in_progress = result.exitStatus == null
         binding.build_exit_status = result.exitStatus
         binding.build_user = (result.userName ?: '-') + " (ip: ${result.requestIp})"
         binding.build_time = formatTimestamp(result.startTime, result.offsetId) ?: '-'

src/main/groovy/io/seqera/wave/service/builder/BuildStrategy.groovy

@@ -37,6 +37,8 @@ abstract class BuildStrategy {
 
     abstract BuildResult build(BuildRequest req)
 
+    abstract String getLogs(String buildId)
+
     void cleanup(BuildRequest req) {
         req.workDir?.deleteDir()
     }

src/main/groovy/io/seqera/wave/service/builder/DockerBuildStrategy.groovy

@@ -110,13 +110,13 @@ class DockerBuildStrategy extends BuildStrategy {
         final spack = req.isSpackBuild ? spackConfig : null
 
         final dockerCmd = req.formatDocker()
-                ? cmdForKaniko( req.workDir, credsFile, spack, req.platform)
-                : cmdForSingularity( req.workDir, credsFile, spack, req.platform)
+                ? cmdForKaniko( req.workDir, credsFile, spack, req.platform, req.buildId)
+                : cmdForSingularity( req.workDir, credsFile, spack, req.platform, req.buildId)
 
         return dockerCmd + launchCmd(req)
     }
 
-    protected List<String> cmdForKaniko(Path workDir, Path credsFile, SpackConfig spackConfig, ContainerPlatform platform ) {
+    protected List<String> cmdForKaniko(Path workDir, Path credsFile, SpackConfig spackConfig, ContainerPlatform platform, String buildId) {
         final wrapper = ['docker',
                          'run',
                          '--rm',
@@ -137,13 +137,18 @@ class DockerBuildStrategy extends BuildStrategy {
             wrapper.add('--platform')
             wrapper.add(platform.toString())
         }
+
+        //add builder name
+        wrapper.add('--name')
+        wrapper.add(builderName(buildId))
+
         // the container image to be used t
         wrapper.add( buildConfig.kanikoImage )
         // return it
         return wrapper
     }
 
-    protected List<String> cmdForSingularity(Path workDir, Path credsFile, SpackConfig spackConfig, ContainerPlatform platform) {
+    protected List<String> cmdForSingularity(Path workDir, Path credsFile, SpackConfig spackConfig, ContainerPlatform platform, String buildId) {
         final wrapper = ['docker',
                          'run',
                          '--rm',
@@ -170,7 +175,26 @@ class DockerBuildStrategy extends BuildStrategy {
             wrapper.add(platform.toString())
         }
 
+        //add builder name
+        wrapper.add('--name')
+        wrapper.add(builderName(buildId))
+
         wrapper.add(buildConfig.singularityImage(platform))
         return wrapper
     }
+
+    protected static String builderName(String buildId) {
+        return "build-${buildId}".toString().replace('_', '-')
+    }
+
+    @Override
+    String getLogs(String buildId) {
+        def logCmd = ['docker', 'logs'] + builderName(buildId)
+        log.info("Get build logs: ${logCmd.join(' ')}")
+        final proc = new ProcessBuilder()
+                .command(logCmd)
+                .redirectErrorStream(true)
+                .start()
+        return proc.inputStream.text
+    }
 }

src/main/groovy/io/seqera/wave/service/builder/KubeBuildStrategy.groovy

@@ -71,8 +71,8 @@ class KubeBuildStrategy extends BuildStrategy {
     @Inject
     private RegistryProxyService proxyService
 
-    protected String podName(BuildRequest req) {
-        return "build-${req.buildId}".toString().replace('_', '-')
+    protected String podName(String buildId) {
+        return "build-${buildId}".toString().replace('_', '-')
     }
 
     @Override
@@ -96,7 +96,7 @@ class KubeBuildStrategy extends BuildStrategy {
         try {
             final buildImage = getBuildImage(req)
             final buildCmd = launchCmd(req)
-            final name = podName(req)
+            final name = podName(req.buildId)
             final selector= getSelectorLabel(req.platform, nodeSelectorMap)
             final spackCfg0 = req.isSpackBuild ? spackConfig : null
             final pod = k8sService.buildContainer(name, buildImage, buildCmd, req.workDir, configFile, spackCfg0, selector)
@@ -130,7 +130,7 @@ class KubeBuildStrategy extends BuildStrategy {
     @Override
     void cleanup(BuildRequest req) {
         super.cleanup(req)
-        final name = podName(req)
+        final name = podName(req.buildId)
         try {
             k8sService.deletePod(name)
         }
@@ -139,4 +139,9 @@ class KubeBuildStrategy extends BuildStrategy {
         }
     }
 
+    @Override
+    String getLogs(String buildId) {
+        return k8sService.getCurrentLogsPod(podName(buildId))
+    }
+
 }

src/main/groovy/io/seqera/wave/service/k8s/K8sService.groovy

@@ -54,4 +54,6 @@ interface K8sService {
     V1Pod transferContainer(String name, String containerImage, List<String> args, BlobCacheConfig blobConfig)
 
     V1ContainerStateTerminated waitPod(V1Pod pod, long timeout)
+
+    String getCurrentLogsPod(String name)
 }

src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy

@@ -19,6 +19,7 @@
 package io.seqera.wave.service.k8s
 
 import java.nio.file.Path
+import java.util.stream.Collectors
 import javax.annotation.PostConstruct
 
 import groovy.transform.CompileDynamic
@@ -35,6 +36,7 @@ import io.kubernetes.client.openapi.models.V1JobBuilder
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimVolumeSource
 import io.kubernetes.client.openapi.models.V1Pod
 import io.kubernetes.client.openapi.models.V1PodBuilder
+import io.kubernetes.client.openapi.models.V1PodStatus
 import io.kubernetes.client.openapi.models.V1ResourceRequirements
 import io.kubernetes.client.openapi.models.V1Volume
 import io.kubernetes.client.openapi.models.V1VolumeMount
@@ -460,6 +462,23 @@ class K8sServiceImpl implements K8sService {
         }
     }
 
+    /**
+     * Fetch current available logs of a running pod
+     *
+     * @param name The pod name
+     * @return The logs as a string or when logs are not available or cannot be accessed
+     */
+    @Override
+    String getCurrentLogsPod(String name) {
+        try {
+            return k8sClient.coreV1Api().readNamespacedPodLog(name, namespace, null, null, null, null, null, null, null, null, null)
+        } catch (Exception e) {
+            // logging trace here because errors are expected when the pod is not running
+            log.trace "Unable to fetch logs for pod: $name", e
+            return null
+        }
+    }
+
     /**
      * Delete a pod
      *

src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy

@@ -18,20 +18,23 @@
 
 package io.seqera.wave.service.logs
 
+import java.nio.charset.StandardCharsets
 import java.util.concurrent.CompletableFuture
 import io.micronaut.core.annotation.Nullable
 
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.micronaut.context.annotation.Requires
 import io.micronaut.context.annotation.Value
+import io.micronaut.http.MediaType
 import io.micronaut.http.server.types.files.StreamedFile
 import io.micronaut.objectstorage.ObjectStorageEntry
 import io.micronaut.objectstorage.ObjectStorageOperations
 import io.micronaut.objectstorage.request.UploadRequest
 import io.micronaut.runtime.event.annotation.EventListener
 import io.seqera.wave.service.builder.BuildEvent
 import io.seqera.wave.service.builder.BuildRequest
+import io.seqera.wave.service.builder.BuildStrategy
 import io.seqera.wave.service.persistence.PersistenceService
 import jakarta.annotation.PostConstruct
 import jakarta.inject.Inject
@@ -56,6 +59,9 @@ class BuildLogServiceImpl implements BuildLogService {
     @Inject
     private PersistenceService persistenceService
 
+    @Inject
+    private BuildStrategy buildStrategy
+
     @Nullable
     @Value('${wave.build.logs.prefix}')
     private String prefix
@@ -107,7 +113,18 @@ class BuildLogServiceImpl implements BuildLogService {
     private StreamedFile fetchLogStream0(String buildId) {
         if( !buildId ) return null
         final Optional<ObjectStorageEntry<?>> result = objectStorageOperations.retrieve(logKey(buildId))
-        return result.isPresent() ? result.get().toStreamedFile() : null
+        return result.isPresent() ? result.get().toStreamedFile() : fetchLogStream1(buildId)
+    }
+
+    private StreamedFile fetchLogStream1(String buildId) {
+        def logs = buildStrategy.getLogs(buildId)
+        if( !logs )
+            return null
+        else
+        //replace all regex is removing color from log otherwise it will not be displayed correctly in browser
+            logs = logs.replaceAll("\u001B\\[[;\\d]*m", "")
+        def inputStream = new ByteArrayInputStream(logs.getBytes(StandardCharsets.UTF_8))
+        return inputStream ? new StreamedFile(inputStream, MediaType.TEXT_HTML_TYPE) : null
     }
 
     @Override

src/main/resources/io/seqera/wave/build-view.hbs

@@ -21,12 +21,18 @@
             Container build completed successfully!
         </h4>
     </div>
-    {{else}}
+    {{else build_failed}}
     <div style="color: #a94442; background-color: #f2dede; padding: 15px; border: 1px solid transparent; border-radius: 4px;">
         <h4 style="margin-top:0; color: inherit;">
             Container build failed
         </h4>
     </div>
+    {{else build_in_progress}}
+        <div style="color: #3c763d; background-color: #ffd300; padding: 15px; border: 1px solid transparent; border-radius: 4px;">
+            <h4 style="margin-top:0; color: inherit;">
+                Container build in progress
+            </h4>
+        </div>
     {{/if}}
 
     <h3>Summary</h3>
@@ -98,12 +104,50 @@
 
     {{#if build_log_data}}
     <h3>Build logs</h3>
-    <pre style="white-space: pre-wrap; overflow-x: auto; overflow-y: auto; background-color: #ededed; padding: 15px; border-radius: 4px; margin-bottom:30px;">{{build_log_data}}</pre>
+    <pre id="buildLogs" style="white-space: pre-wrap; overflow-x: auto; overflow-y: auto; background-color: #ededed; padding: 15px; border-radius: 4px; margin-bottom:30px;">{{build_log_data}}</pre>
       {{#if build_log_truncated}}
       <a href="{{build_log_url}}" download>Click here to download the complete build log</a>
       {{/if}}
     {{/if}}
 
+    <script>
+        function checkStatusAndFetchData() {
+                fetch("{{server_url}}/v1alpha1/builds/{{build_id}}/status", {method: 'GET'})
+                        .then(response => {
+                            if (!response.ok) {
+                                clearInterval(interval)
+                                return;
+                            }
+                            return response.json();
+                        }).then(statusResponse => {
+                            if (statusResponse.status === 'PENDING') {
+                                fetchData();
+                            }else{
+                                clearInterval(interval)
+                            }
+                        }).catch(error => {
+                            console.error('Error checking status:', error)
+                            clearInterval(interval)
+                });
+            }
+        function fetchData() {
+            fetch('{{server_url}}/v1alpha1/builds/{{build_id}}/logs', {method: 'GET', cache: 'no-cache'})
+                    .then(response => {
+                        if (!response.ok) {
+                            clearInterval(interval)
+                            return;
+                        }
+                        return response.text();
+                    }).then(logs => {
+                        document.getElementById('buildLogs').innerHTML = logs;
+                    }).catch(error => {
+                        console.error('Error fetching build logs:', error)
+                        clearInterval(interval)
+            });
+        }
+
+        const interval = setInterval(checkStatusAndFetchData, 2000);
+    </script>
 
     <div class="footer" style="clear:both;width:100%;">
         <hr class="footer-hr" style="height:0;overflow:visible;margin-top:30px;border:0;border-top:1px solid #eee;color:#999999;font-size:12px;line-height:18px;margin-bottom:30px;">

src/test/groovy/io/seqera/wave/service/builder/DockerBuildStrategyTest.groovy

@@ -45,34 +45,37 @@ class DockerBuildStrategyTest extends Specification {
         and:
         def work = Path.of('/work/foo')
         when:
-        def cmd = service.cmdForKaniko(work, null, null, null)
+        def cmd = service.cmdForKaniko(work, null, null, null, '1234')
         then:
         cmd == ['docker',
                 'run',
                 '--rm',
                 '-v', '/work/foo:/work/foo',
+                '--name', 'build-1234',
                 'gcr.io/kaniko-project/executor:v1.19.2']
 
         when:
-        cmd = service.cmdForKaniko(work, Path.of('/foo/creds.json'), null, ContainerPlatform.of('arm64'))
+        cmd = service.cmdForKaniko(work, Path.of('/foo/creds.json'), null, ContainerPlatform.of('arm64'), '1234')
         then:
         cmd == ['docker',
                 'run',
                 '--rm',
                 '-v', '/work/foo:/work/foo',
                 '-v', '/foo/creds.json:/kaniko/.docker/config.json:ro',
                 '--platform', 'linux/arm64',
+                '--name', 'build-1234',
                 'gcr.io/kaniko-project/executor:v1.19.2']
 
         when:
-        cmd = service.cmdForKaniko(work, Path.of('/foo/creds.json'), spackConfig, null)
+        cmd = service.cmdForKaniko(work, Path.of('/foo/creds.json'), spackConfig, null, '1234')
         then:
         cmd == ['docker',
                 'run',
                 '--rm',
                 '-v', '/work/foo:/work/foo',
                 '-v', '/foo/creds.json:/kaniko/.docker/config.json:ro',
                 '-v', '/host/spack/key:/opt/spack/key:ro',
+                '--name', 'build-1234',
                 'gcr.io/kaniko-project/executor:v1.19.2']
 
         cleanup:
@@ -87,6 +90,7 @@ class DockerBuildStrategyTest extends Specification {
         def creds = Path.of('/work/creds.json')
         and:
         def req = new BuildRequest(
+                buildId: '1234',
                 workDir: Path.of('/work/foo/89fb83ce6ec8627b'),
                 platform: ContainerPlatform.of('linux/amd64'),
                 targetImage: 'repo:89fb83ce6ec8627b',
@@ -100,6 +104,7 @@ class DockerBuildStrategyTest extends Specification {
                 '-v', '/work/foo/89fb83ce6ec8627b:/work/foo/89fb83ce6ec8627b',
                 '-v', '/work/creds.json:/kaniko/.docker/config.json:ro',
                 '--platform', 'linux/amd64',
+                '--name', 'build-1234',
                 'gcr.io/kaniko-project/executor:v1.19.2',
                 '--dockerfile', '/work/foo/89fb83ce6ec8627b/Containerfile',
                 '--context', '/work/foo/89fb83ce6ec8627b/context',
@@ -118,6 +123,7 @@ class DockerBuildStrategyTest extends Specification {
         def service = ctx.getBean(DockerBuildStrategy)
         and:
         def req = new BuildRequest(
+                buildId: '1234',
                 workDir: Path.of('/work/foo/89fb83ce6ec8627b'),
                 platform: ContainerPlatform.of('linux/amd64'),
                 targetImage: 'repo:89fb83ce6ec8627b',
@@ -151,6 +157,7 @@ class DockerBuildStrategyTest extends Specification {
         def creds = Path.of('/work/creds.json')
         and:
         def req = new BuildRequest(
+                buildId: '1234',
                 workDir: Path.of('/work/foo/d4869cc39b8d7d55'),
                 platform: ContainerPlatform.of('linux/amd64'),
                 targetImage: 'oras://repo:d4869cc39b8d7d55',
@@ -170,6 +177,7 @@ class DockerBuildStrategyTest extends Specification {
                 '-v', '/work/singularity-remote.yaml:/root/.singularity/remote.yaml:ro',
                 '-v', '/host/spack/key:/opt/spack/key:ro',
                 '--platform', 'linux/amd64',
+                '--name', 'build-1234',
                 'quay.io/singularity/singularity:v3.11.4-slim',
                 'sh',
                 '-c',
@@ -193,6 +201,7 @@ class DockerBuildStrategyTest extends Specification {
         def creds = Path.of('/work/creds.json')
         and:
         def req = new BuildRequest(
+                buildId: '1234',
                 workDir: Path.of('/work/foo/9c68af894bb2419c'),
                 platform: ContainerPlatform.of('linux/arm64'),
                 targetImage: 'oras://repo:9c68af894bb2419c',
@@ -212,6 +221,7 @@ class DockerBuildStrategyTest extends Specification {
                 '-v', '/work/singularity-remote.yaml:/root/.singularity/remote.yaml:ro',
                 '-v', '/host/spack/key:/opt/spack/key:ro',
                 '--platform', 'linux/arm64',
+                '--name', 'build-1234',
                 'quay.io/singularity/singularity:v3.11.4-slim-arm64',
                 'sh',
                 '-c',