removed spack

Signed-off-by: munishchouhan <[email protected]>

Author: munishchouhan

README.md

@@ -11,10 +11,8 @@ that it can be used in your Docker (replace-with-your-own-fav-container-engine)
 
 * Build container images on-demand for a given container file (aka Dockerfile);
 * Build container images on-demand based on one or more [Conda](https://conda.io/) packages;
-* Build container images on-demand based on one or more [Spack](https://spack.io/)  packages;
 * Build container images for a specified target platform (currently linux/amd64 and linux/arm64);
 * Push and cache built containers to a user-provided container repository;
-* Build Singularity native containers both using a Singularity spec file, Conda package(s) and Spack package(s);
 * Push Singularity native container images to OCI-compliant registries;
 
 ### Installation 
@@ -148,13 +146,6 @@ container=$(wave --conda-package fastp --platform linux/arm64)
 docker run --platform linux/arm64 $container sh -c 'fastp --version'
 ```
 
-#### Build a Spack package container
-
-```bash
-container=$(wave --spack-package cowsay)
-docker run $container sh -c 'cowsay Hello world!'
-```
-
 #### Build a Singularity container using a Conda package and pushing to a OCI registry
 
 ```bash

app/conf/reflect-config.json

@@ -257,7 +257,7 @@
 },
 {
   "name":"io.seqera.wave.api.PackagesSpec$Type",
-  "fields":[{"name":"CONDA"}, {"name":"SPACK"}]
+  "fields":[{"name":"CONDA"}]
 },
 {
   "name":"io.seqera.wave.api.ServiceInfo",
@@ -337,11 +337,6 @@
   "allDeclaredFields":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
-{
-  "name":"io.seqera.wave.config.SpackOpts",
-  "allDeclaredFields":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
 {
   "name":"io.seqera.wave.core.spec.ConfigSpec",
   "allDeclaredFields":true,

app/conf/resource-config.json

@@ -38,10 +38,6 @@
     "pattern":"\\Qtemplates/conda/singularityfile-conda-file.txt\\E"
   }, {
     "pattern":"\\Qtemplates/conda/singularityfile-conda-packages.txt\\E"
-  }, {
-    "pattern":"\\Qtemplates/spack/dockerfile-spack-file.txt\\E"
-  }, {
-    "pattern":"\\Qtemplates/spack/singularityfile-spack-file.txt\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfc.nrm\\E"
   }, {

app/src/main/java/io/seqera/wave/cli/App.java

@@ -53,7 +53,6 @@
 import io.seqera.wave.cli.util.GptHelper;
 import io.seqera.wave.cli.util.YamlHelper;
 import io.seqera.wave.config.CondaOpts;
-import io.seqera.wave.config.SpackOpts;
 import io.seqera.wave.util.DockerIgnoreFilter;
 import io.seqera.wave.util.Packer;
 import org.slf4j.LoggerFactory;
@@ -154,15 +153,6 @@ public class App implements Runnable {
     @Option(names = {"--conda-channels"}, paramLabel = "''", description = "Conda channels used to build the container (default: ${DEFAULT-VALUE}).")
     private String condaChannels = DEFAULT_CONDA_CHANNELS;
 
-    @Option(names = {"--spack-file"}, paramLabel = "''",  description = "A Spack file used to build the container e.g. /some/path/spack.yaml.")
-    private String spackFile;
-
-    @Option(names = {"--spack-package"}, paramLabel = "''", description = "One or more Spack packages used to build the container e.g. cowsay.")
-    private List<String> spackPackages;
-
-    @Option(names = {"--spack-run-command"}, paramLabel = "''",  description = "Dockerfile RUN commands used to build the container.")
-    private List<String> spackRunCommands;
-
     @Option(names = {"--log-level"}, paramLabel = "''", description = "Set the application log level. One of: OFF, ERROR, WARN, INFO, DEBUG, TRACE and ALL")
     private String logLevel;
 
@@ -304,7 +294,7 @@ protected void validateArgs() {
         if( !isEmpty(image) && !isEmpty(containerFile) )
             throw new IllegalCliArgumentException("Argument --image and --containerfile conflict each other - Specify an image name or a container file for the container to be provisioned");
 
-        if( isEmpty(image) && isEmpty(containerFile) && isEmpty(condaFile) && condaPackages==null  && isEmpty(spackFile) && spackPackages==null && isEmpty(prompt) )
+        if( isEmpty(image) && isEmpty(containerFile) && isEmpty(condaFile) && condaPackages==null && isEmpty(prompt) )
             throw new IllegalCliArgumentException("Provide either a image name or a container file for the Wave container to be provisioned");
 
         if( isEmpty(towerToken) && !isEmpty(buildRepository) )
@@ -326,45 +316,14 @@ protected void validateArgs() {
         if( condaPackages!=null && !isEmpty(containerFile) )
             throw new IllegalCliArgumentException("Option --conda-package and --containerfile conflict each other");
 
-        // -- check spack options
-        if( !isEmpty(spackFile) && spackPackages!=null )
-            throw new IllegalCliArgumentException("Option --spack-file and --spack-package conflict each other");
-
-        if( !isEmpty(spackFile) && !isEmpty(image) )
-            throw new IllegalCliArgumentException("Option --spack-file and --image conflict each other");
-
-        if( !isEmpty(spackFile) && !isEmpty(containerFile) )
-            throw new IllegalCliArgumentException("Option --spack-file and --containerfile conflict each other");
-
-        if( spackPackages!=null && !isEmpty(image) )
-            throw new IllegalCliArgumentException("Option --spack-package and --image conflict each other");
-
-        if( spackPackages!=null && !isEmpty(containerFile) )
-            throw new IllegalCliArgumentException("Option --spack-package and --containerfile conflict each other");
-
         if( !isEmpty(outputFormat) && !List.of("json","yaml").contains(outputFormat) ) {
             final String msg = String.format("Invalid output format: '%s' - expected value: json, yaml", outputFormat);
             throw new IllegalCliArgumentException(msg);
         }
 
-        if( condaPackages!=null && spackPackages!=null )
-            throw new IllegalCliArgumentException("Option --conda-package and --spack-package conflict each other");
-
-        if( condaPackages!=null && !isEmpty(spackFile) )
-            throw new IllegalCliArgumentException("Option --conda-package and --spack-file conflict each other");
-
-        if( !isEmpty(condaFile) && spackPackages!=null )
-            throw new IllegalCliArgumentException("Option --conda-file and --spack-package conflict each other");
-
-        if( !isEmpty(condaFile) && !isEmpty(spackFile) )
-            throw new IllegalCliArgumentException("Option --conda-file and --spack-file conflict each other");
-
         if( !isEmpty(condaFile) && !Files.exists(Path.of(condaFile)) )
             throw new IllegalCliArgumentException("The specified Conda file path cannot be accessed - offending file path: " + condaFile);
 
-        if( !isEmpty(spackFile) && !Files.exists(Path.of(spackFile)) )
-            throw new IllegalCliArgumentException("The specified Spack file path cannot be accessed - offending file path: " + spackFile);
-
         if( !isEmpty(contextDir) && isEmpty(containerFile) )
             throw new IllegalCliArgumentException("Option --context requires the use of a container file");
 
@@ -588,11 +547,6 @@ private CondaOpts condaOpts() {
                 ;
     }
 
-    private SpackOpts spackOpts() {
-        return new SpackOpts()
-                .withCommands(spackRunCommands);
-    }
-
     protected String containerFileBase64() {
         return !isEmpty(containerFile)
                 ? encodePathBase64(containerFile)
@@ -618,20 +572,6 @@ protected PackagesSpec packagesSpec() {
                     ;
         }
 
-        if( !isEmpty(spackFile) ) {
-            return new PackagesSpec()
-                    .withType(PackagesSpec.Type.SPACK)
-                    .withSpackOpts(spackOpts())
-                    .withEnvironment(encodePathBase64(spackFile));
-        }
-
-        if( !isEmpty(spackPackages) ) {
-            return new PackagesSpec()
-                    .withType(PackagesSpec.Type.SPACK)
-                    .withSpackOpts(spackOpts())
-                    .withEntries(spackPackages);
-        }
-
         if( !isEmpty(prompt) ) {
             return GptHelper.grabPackages(prompt.stream().collect(Collectors.joining(" ")));
         }

app/src/main/resources/io/seqera/wave/cli/usage-examples.txt

@@ -15,9 +15,6 @@ Examples:
   # Build a container based on Conda lock file served via prefix.dev service
   wave --conda-package https://prefix.dev/envs/pditommaso/wave/conda-lock.yml
 
-  # Build a container based on Spack packages
-  wave --spack-package cowsay
-
   # Build a container getting a persistent image name
   wave -i alpine --freeze --build-repo docker.io/user/repo --tower-token <YOUR TOKEN>