Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for singularity - similar config to apptainer #84

Closed
wants to merge 1 commit into from
Closed

Support for singularity - similar config to apptainer #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/fr/insalyon/creatis/gasw/GaswConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public class GaswConfiguration {
// Boutiques installation
private String boshCVMFSPath;
private String apptainerPath;
private String singularityPath;
private String containersCVMFSPath;
private String udockerTag;
private String boutiquesProvenanceDir;
Expand Down Expand Up @@ -165,7 +166,8 @@ private void loadConfigurationFile() throws GaswException {
voUseCloseSE = config.getString(GaswConstants.LAB_VO_USE_CLOSE_SE, "\"true\"");

boshCVMFSPath = config.getString(GaswConstants.LAB_BOSH_CVMFS_PATH, "\"/cvmfs/biomed.egi.eu/vip/virtualenv/bin\"");
apptainerPath = config.getString(GaswConstants.LAB_APPTAINER_PATH, "\"/cvmfs/dirac.egi.eu/container/apptainer/bin\"");
apptainerPath = config.getString(GaswConstants.LAB_APPTAINER_PATH, "\"/cvmfs/dirac.egi.eu/dirac/v8.0.39/Linux-x86_64/libexec/\"");
singularityPath = config.getString(GaswConstants.LAB_SINGULARITY_PATH, "\"/cvmfs/dirac.egi.eu/dirac/v8.0.39/Linux-x86_64/bin/\"");
containersCVMFSPath = config.getString(GaswConstants.LAB_CONTAINERS_CVMFS_PATH, "\"/cvmfs/biomed.egi.eu/vip/udocker/containers\"");
udockerTag = config.getString(GaswConstants.LAB_UDOCKER_TAG, "\"1.3.1\"");
boutiquesProvenanceDir = config.getString(GaswConstants.LAB_BOUTIQUES_PROV_DIR, "\"$HOME/.cache/boutiques/data\"");
Expand Down Expand Up @@ -201,6 +203,7 @@ private void loadConfigurationFile() throws GaswException {

config.setProperty(GaswConstants.LAB_BOSH_CVMFS_PATH, boshCVMFSPath);
config.setProperty(GaswConstants.LAB_APPTAINER_PATH, apptainerPath);
config.setProperty(GaswConstants.LAB_SINGULARITY_PATH, singularityPath);
config.setProperty(GaswConstants.LAB_CONTAINERS_CVMFS_PATH, containersCVMFSPath);
config.setProperty(GaswConstants.LAB_UDOCKER_TAG, udockerTag);
config.setProperty(GaswConstants.LAB_BOUTIQUES_PROV_DIR, boutiquesProvenanceDir);
Expand Down Expand Up @@ -429,6 +432,10 @@ public String getApptainerPath() {
return apptainerPath;
}

public String getSingularityPath() {
return singularityPath;
}

public String getBoutiquesProvenanceDir() {
return boutiquesProvenanceDir;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fr/insalyon/creatis/gasw/GaswConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class GaswConstants {
public static final String LAB_VO_USE_CLOSE_SE = "vo.use.close.se";
public static final String LAB_BOSH_CVMFS_PATH = "bosh.cvmfs.path";
public static final String LAB_APPTAINER_PATH = "apptainer.path";
public static final String LAB_SINGULARITY_PATH = "singularity.path";
public static final String LAB_CONTAINERS_CVMFS_PATH = "containers.cvmfs.path";
public static final String LAB_UDOCKER_TAG = "udocker.tag";
public static final String LAB_BOUTIQUES_PROV_DIR = "boutiques.provenance.dir";
Expand Down