Replace EFS with S3

src/main/groovy/io/seqera/wave/configuration/BuildConfig.groovy

@@ -58,11 +58,12 @@ class BuildConfig {
     @Value('${wave.build.public-repo}')
     String defaultPublicRepository
 
-    /**
-     * File system path there the dockerfile is save
-     */
-    @Value('${wave.build.workspace}')
-    String buildWorkspace
+    @Nullable
+    @Value('${wave.build.logs.bucket}')
+    String storageBucket
+
+    @Value('${wave.build.workspace-bucket}')
+    String workspaceBucket
 
     @Value('${wave.build.status.delay}')
     Duration statusDelay
@@ -119,7 +120,6 @@ class BuildConfig {
                 "default-build-repository=${defaultBuildRepository}; " +
                 "default-cache-repository=${defaultCacheRepository}; " +
                 "default-public-repository=${defaultPublicRepository}; " +
-                "build-workspace=${buildWorkspace}; " +
                 "build-timeout=${defaultTimeout}; " +
                 "build-trusted-timeout=${trustedTimeout}; " +
                 "status-delay=${statusDelay}; " +

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

@@ -335,7 +335,6 @@ class ContainerController {
                 containerFile,
                 condaContent,
                 spackContent,
-                Path.of(buildConfig.buildWorkspace),
                 targetImage,
                 identity,
                 platform,

src/main/groovy/io/seqera/wave/service/aws/ObjectStorageOperationsFactory.groovy

@@ -22,11 +22,12 @@ import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import io.micronaut.context.annotation.Factory
 import io.micronaut.context.annotation.Requires
-import io.micronaut.context.annotation.Value
 import io.micronaut.objectstorage.InputStreamMapper
 import io.micronaut.objectstorage.ObjectStorageOperations
 import io.micronaut.objectstorage.aws.AwsS3Configuration
 import io.micronaut.objectstorage.aws.AwsS3Operations
+import io.seqera.wave.configuration.BuildConfig
+import jakarta.inject.Inject
 import jakarta.inject.Named
 import jakarta.inject.Singleton
 import software.amazon.awssdk.services.s3.S3Client
@@ -38,17 +39,26 @@ import software.amazon.awssdk.services.s3.S3Client
 @Factory
 @CompileStatic
 @Slf4j
-@Requires(property = 'wave.build.logs.bucket')
 class ObjectStorageOperationsFactory {
 
-    @Value('${wave.build.logs.bucket}')
-    String storageBucket
+    @Inject
+    private BuildConfig buildConfig
 
     @Singleton
     @Named("build-logs")
-    ObjectStorageOperations<?, ?, ?> awsStorageOperations(@Named("DefaultS3Client") S3Client s3Client, InputStreamMapper inputStreamMapper) {
+    @Requires(property = 'wave.build.logs.bucket')
+    ObjectStorageOperations<?, ?, ?> awsStorageOperationsBuildLogs(@Named("DefaultS3Client") S3Client s3Client, InputStreamMapper inputStreamMapper) {
         AwsS3Configuration configuration = new AwsS3Configuration('build-logs')
-        configuration.setBucket(storageBucket)
+        configuration.setBucket(buildConfig.storageBucket)
+        return new AwsS3Operations(configuration, s3Client, inputStreamMapper)
+    }
+
+    @Singleton
+    @Named("build-workspace")
+    @Requires(property = 'wave.build.workspace-bucket')
+    ObjectStorageOperations<?, ?, ?> awsStorageOperationsBuildWorkspace(@Named("DefaultS3Client") S3Client s3Client, InputStreamMapper inputStreamMapper) {
+        AwsS3Configuration configuration = new AwsS3Configuration('build-workspace')
+        configuration.setBucket(buildConfig.workspaceBucket)
         return new AwsS3Operations(configuration, s3Client, inputStreamMapper)
     }
 }

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

@@ -0,0 +1,31 @@
+/*
+ *  Wave, containers provisioning service
+ *  Copyright (c) 2023-2024, Seqera Labs
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.seqera.wave.service.builder
+
+/**
+ * Constants for the build service
+ *
+ * @author Munish Chouhan <[email protected]>
+ */
+class BuildConstants {
+
+    public static final String FUSION_PREFIX = "/fusion/s3"
+
+    static final public String BUILDKIT_ENTRYPOINT = 'buildctl-daemonless.sh'
+}

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

@@ -18,7 +18,6 @@
 
 package io.seqera.wave.service.builder
 
-import java.nio.file.Path
 import java.time.Duration
 import java.time.Instant
 import java.time.OffsetDateTime
@@ -65,11 +64,6 @@ class BuildRequest {
      */
     final String spackFile
 
-    /**
-     * The build context work directory
-     */
-    final Path workspace
-
     /**
      * The target fully qualified image of the built container. It includes the target registry name
      */
@@ -142,13 +136,13 @@ class BuildRequest {
 
     volatile String buildId
 
-    volatile Path workDir
+
+    String s3Key
 
     BuildRequest(String containerId,
                  String containerFile,
                  String condaFile,
                  String spackFile,
-                 Path workspace,
                  String targetImage,
                  PlatformId identity,
                  ContainerPlatform platform,
@@ -167,7 +161,6 @@ class BuildRequest {
         this.containerFile = containerFile
         this.condaFile = condaFile
         this.spackFile = spackFile
-        this.workspace = workspace
         this.targetImage = targetImage
         this.identity = identity
         this.platform = platform
@@ -189,7 +182,6 @@ class BuildRequest {
         this.containerFile = opts.containerFile
         this.condaFile = opts.condaFile
         this.spackFile = opts.spackFile
-        this.workspace = opts.workspace as Path
         this.targetImage = opts.targetImage
         this.identity = opts.identity as PlatformId
         this.platform = opts.platform as ContainerPlatform
@@ -203,7 +195,6 @@ class BuildRequest {
         this.scanId = opts.scanId
         this.buildContext = opts.buildContext as BuildContext
         this.format = opts.format as BuildFormat
-        this.workDir = opts.workDir as Path
         this.buildId = opts.buildId
         this.maxDuration = opts.maxDuration as Duration
     }
@@ -234,10 +225,6 @@ class BuildRequest {
         return spackFile
     }
 
-    Path getWorkDir() {
-        return workDir
-    }
-
     String getTargetImage() {
         return targetImage
     }
@@ -284,7 +271,7 @@ class BuildRequest {
 
     BuildRequest withBuildId(String id) {
         this.buildId = containerId + SEP + id
-        this.workDir = workspace.resolve(buildId).toAbsolutePath()
+        this.s3Key = "workspace/$buildId"
         return this
     }
 

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

@@ -19,8 +19,12 @@
 package io.seqera.wave.service.builder
 
 import groovy.transform.CompileStatic
+import io.micronaut.objectstorage.ObjectStorageOperations
 import io.seqera.wave.configuration.BuildConfig
 import jakarta.inject.Inject
+import jakarta.inject.Named
+import static io.seqera.wave.service.builder.BuildConstants.FUSION_PREFIX
+import static io.seqera.wave.service.builder.BuildConstants.BUILDKIT_ENTRYPOINT
 /**
  * Defines an abstract container build strategy.
  *
@@ -35,12 +39,14 @@ abstract class BuildStrategy {
     @Inject
     private BuildConfig buildConfig
 
-    abstract BuildResult build(BuildRequest req)
+    @Inject
+    @Named('build-workspace')
+    private ObjectStorageOperations<?, ?, ?> objectStorageOperations
 
-    static final public String BUILDKIT_ENTRYPOINT = 'buildctl-daemonless.sh'
+    abstract BuildResult build(BuildRequest req)
 
     void cleanup(BuildRequest req) {
-        req.workDir?.deleteDir()
+        objectStorageOperations.delete(req.s3Key)
     }
 
     List<String> launchCmd(BuildRequest req) {
@@ -57,15 +63,16 @@ abstract class BuildStrategy {
     protected List<String> dockerLaunchCmd(BuildRequest req) {
         final result = new ArrayList(10)
         result
+                << BUILDKIT_ENTRYPOINT
                 << "build"
                 << "--frontend"
                 << "dockerfile.v0"
                 << "--local"
-                << "dockerfile=$req.workDir".toString()
+                << "dockerfile=$FUSION_PREFIX/$buildConfig.workspaceBucket/$req.s3Key".toString()
                 << "--opt"
                 << "filename=Containerfile"
                 << "--local"
-                << "context=$req.workDir/context".toString()
+                << "context=$FUSION_PREFIX/$buildConfig.workspaceBucket/$req.s3Key/context".toString()
                 << "--output"
                 << "type=image,name=$req.targetImage,push=true,oci-mediatypes=${buildConfig.ociMediatypes}".toString()
                 << "--opt"
@@ -105,11 +112,15 @@ abstract class BuildStrategy {
     }
 
     protected List<String> singularityLaunchCmd(BuildRequest req) {
+        def symlinkSingularity = ""
+        if( req.configJson ){
+            symlinkSingularity = "ln -s $FUSION_PREFIX/$buildConfig.workspaceBucket/$req.s3Key/.singularity /root/.singularity &&"
+        }
         final result = new ArrayList(10)
         result
             << 'sh'
             << '-c'
-            << "singularity build image.sif ${req.workDir}/Containerfile && singularity push image.sif ${req.targetImage}".toString()
+            << "$symlinkSingularity singularity build image.sif $FUSION_PREFIX/$buildConfig.workspaceBucket/$req.s3Key/Containerfile && singularity push image.sif ${req.targetImage}".toString()
         return result
     }