diff --git a/definition-files/anaconda/Singularity.anaconda2-py27-2019.10-ubuntu-18.04 b/definition-files/mkandas/anaconda/Singularity.anaconda2-py27-2019.10-ubuntu-18.04
similarity index 100%
rename from definition-files/anaconda/Singularity.anaconda2-py27-2019.10-ubuntu-18.04
rename to definition-files/mkandas/anaconda/Singularity.anaconda2-py27-2019.10-ubuntu-18.04
diff --git a/definition-files/anaconda/Singularity.anaconda3-py38-2020.11-ubuntu-18.04 b/definition-files/mkandas/anaconda/Singularity.anaconda3-py38-2020.11-ubuntu-18.04
similarity index 100%
rename from definition-files/anaconda/Singularity.anaconda3-py38-2020.11-ubuntu-18.04
rename to definition-files/mkandas/anaconda/Singularity.anaconda3-py38-2020.11-ubuntu-18.04
diff --git a/definition-files/beast/Singularity.beast-1.10.4-ubuntu-18.04-cuda-10.1.168 b/definition-files/mkandas/beast/Singularity.beast-1.10.4-ubuntu-18.04-cuda-10.1.168
similarity index 100%
rename from definition-files/beast/Singularity.beast-1.10.4-ubuntu-18.04-cuda-10.1.168
rename to definition-files/mkandas/beast/Singularity.beast-1.10.4-ubuntu-18.04-cuda-10.1.168
diff --git a/definition-files/beast/Singularity.beast-2.6.1-ubuntu-18.04-cuda-10.1.168 b/definition-files/mkandas/beast/Singularity.beast-2.6.1-ubuntu-18.04-cuda-10.1.168
similarity index 100%
rename from definition-files/beast/Singularity.beast-2.6.1-ubuntu-18.04-cuda-10.1.168
rename to definition-files/mkandas/beast/Singularity.beast-2.6.1-ubuntu-18.04-cuda-10.1.168
diff --git a/definition-files/centos/Singularity.centos-7.7.1908 b/definition-files/mkandas/centos/Singularity.centos-7.7.1908
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.7.1908
rename to definition-files/mkandas/centos/Singularity.centos-7.7.1908
diff --git a/definition-files/centos/Singularity.centos-7.7.1908-cuda-11.0 b/definition-files/mkandas/centos/Singularity.centos-7.7.1908-cuda-11.0
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.7.1908-cuda-11.0
rename to definition-files/mkandas/centos/Singularity.centos-7.7.1908-cuda-11.0
diff --git a/definition-files/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-3.1.6 b/definition-files/mkandas/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-3.1.6
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-3.1.6
rename to definition-files/mkandas/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-3.1.6
diff --git a/definition-files/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-4.0.5 b/definition-files/mkandas/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-4.0.5
rename to definition-files/mkandas/centos/Singularity.centos-7.7.1908-cuda-11.0-openmpi-4.0.5
diff --git a/definition-files/centos/Singularity.centos-7.7.1908-openmpi-3.1.6 b/definition-files/mkandas/centos/Singularity.centos-7.7.1908-openmpi-3.1.6
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.7.1908-openmpi-3.1.6
rename to definition-files/mkandas/centos/Singularity.centos-7.7.1908-openmpi-3.1.6
diff --git a/definition-files/centos/Singularity.centos-7.7.1908-openmpi-4.0.5 b/definition-files/mkandas/centos/Singularity.centos-7.7.1908-openmpi-4.0.5
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.7.1908-openmpi-4.0.5
rename to definition-files/mkandas/centos/Singularity.centos-7.7.1908-openmpi-4.0.5
diff --git a/definition-files/centos/Singularity.centos-7.9.2009 b/definition-files/mkandas/centos/Singularity.centos-7.9.2009
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.9.2009
rename to definition-files/mkandas/centos/Singularity.centos-7.9.2009
diff --git a/definition-files/centos/Singularity.centos-7.9.2009-cuda-10.1.168 b/definition-files/mkandas/centos/Singularity.centos-7.9.2009-cuda-10.1.168
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.9.2009-cuda-10.1.168
rename to definition-files/mkandas/centos/Singularity.centos-7.9.2009-cuda-10.1.168
diff --git a/definition-files/centos/Singularity.centos-7.9.2009-mvapich-2.3.2 b/definition-files/mkandas/centos/Singularity.centos-7.9.2009-mvapich-2.3.2
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.9.2009-mvapich-2.3.2
rename to definition-files/mkandas/centos/Singularity.centos-7.9.2009-mvapich-2.3.2
diff --git a/definition-files/centos/Singularity.centos-7.9.2009-openmpi-3.1.4 b/definition-files/mkandas/centos/Singularity.centos-7.9.2009-openmpi-3.1.4
similarity index 100%
rename from definition-files/centos/Singularity.centos-7.9.2009-openmpi-3.1.4
rename to definition-files/mkandas/centos/Singularity.centos-7.9.2009-openmpi-3.1.4
diff --git a/definition-files/ciml/Singularity.esm-0.3.1 b/definition-files/mkandas/ciml/Singularity.esm-0.3.1
similarity index 100%
rename from definition-files/ciml/Singularity.esm-0.3.1
rename to definition-files/mkandas/ciml/Singularity.esm-0.3.1
diff --git a/definition-files/ciml/Singularity.pyspark-3.1.2 b/definition-files/mkandas/ciml/Singularity.pyspark-3.1.2
similarity index 100%
rename from definition-files/ciml/Singularity.pyspark-3.1.2
rename to definition-files/mkandas/ciml/Singularity.pyspark-3.1.2
diff --git a/definition-files/ciml/Singularity.r-3.6.1 b/definition-files/mkandas/ciml/Singularity.r-3.6.1
similarity index 100%
rename from definition-files/ciml/Singularity.r-3.6.1
rename to definition-files/mkandas/ciml/Singularity.r-3.6.1
diff --git a/definition-files/ciml/Singularity.sparkr-2.3.1 b/definition-files/mkandas/ciml/Singularity.sparkr-2.3.1
similarity index 100%
rename from definition-files/ciml/Singularity.sparkr-2.3.1
rename to definition-files/mkandas/ciml/Singularity.sparkr-2.3.1
diff --git a/definition-files/ciml/Singularity.tape-0.4 b/definition-files/mkandas/ciml/Singularity.tape-0.4
similarity index 100%
rename from definition-files/ciml/Singularity.tape-0.4
rename to definition-files/mkandas/ciml/Singularity.tape-0.4
diff --git a/definition-files/deepbench/Singularity.deepbench-da81ba7-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6 b/definition-files/mkandas/deepbench/Singularity.deepbench-da81ba7-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
similarity index 100%
rename from definition-files/deepbench/Singularity.deepbench-da81ba7-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
rename to definition-files/mkandas/deepbench/Singularity.deepbench-da81ba7-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
diff --git a/definition-files/fenics/Singularity.fenics-2019.1.0-ubuntu-18.04-openmpi-3.1.4 b/definition-files/mkandas/fenics/Singularity.fenics-2019.1.0-ubuntu-18.04-openmpi-3.1.4
similarity index 100%
rename from definition-files/fenics/Singularity.fenics-2019.1.0-ubuntu-18.04-openmpi-3.1.4
rename to definition-files/mkandas/fenics/Singularity.fenics-2019.1.0-ubuntu-18.04-openmpi-3.1.4
diff --git a/definition-files/gromacs/Singularity.gromacs-2020.3-ubuntu-18.04-cuda-10.1.168-tmpi-avx-512-cuda-70 b/definition-files/mkandas/gromacs/Singularity.gromacs-2020.3-ubuntu-18.04-cuda-10.1.168-tmpi-avx-512-cuda-70
similarity index 100%
rename from definition-files/gromacs/Singularity.gromacs-2020.3-ubuntu-18.04-cuda-10.1.168-tmpi-avx-512-cuda-70
rename to definition-files/mkandas/gromacs/Singularity.gromacs-2020.3-ubuntu-18.04-cuda-10.1.168-tmpi-avx-512-cuda-70
diff --git a/definition-files/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.4-openblas-0.3.10 b/definition-files/mkandas/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.4-openblas-0.3.10
similarity index 100%
rename from definition-files/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.4-openblas-0.3.10
rename to definition-files/mkandas/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.4-openblas-0.3.10
diff --git a/definition-files/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.6-openblas-0.3.10 b/definition-files/mkandas/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.6-openblas-0.3.10
similarity index 100%
rename from definition-files/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.6-openblas-0.3.10
rename to definition-files/mkandas/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-3.1.6-openblas-0.3.10
diff --git a/definition-files/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-4.0.5-openblas-0.3.14 b/definition-files/mkandas/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-4.0.5-openblas-0.3.14
similarity index 100%
rename from definition-files/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-4.0.5-openblas-0.3.14
rename to definition-files/mkandas/hpl/Singularity.hpl-2.3-ubuntu-18.04-openmpi-4.0.5-openblas-0.3.14
diff --git a/definition-files/ior/Singularity.ior-3.3.0-ubuntu-18.04-openmpi-4.0.5 b/definition-files/mkandas/ior/Singularity.ior-3.3.0-ubuntu-18.04-openmpi-4.0.5
similarity index 100%
rename from definition-files/ior/Singularity.ior-3.3.0-ubuntu-18.04-openmpi-4.0.5
rename to definition-files/mkandas/ior/Singularity.ior-3.3.0-ubuntu-18.04-openmpi-4.0.5
diff --git a/definition-files/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.4 b/definition-files/mkandas/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.4
similarity index 100%
rename from definition-files/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.4
rename to definition-files/mkandas/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.4
diff --git a/definition-files/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.6 b/definition-files/mkandas/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.6
similarity index 100%
rename from definition-files/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.6
rename to definition-files/mkandas/ior/Singularity.ior-3.3.0rc1-ubuntu-18.04-openmpi-3.1.6
diff --git a/definition-files/miniconda/Singularity.miniconda2-py27-4.8.3-ubuntu-18.04 b/definition-files/mkandas/miniconda/Singularity.miniconda2-py27-4.8.3-ubuntu-18.04
similarity index 100%
rename from definition-files/miniconda/Singularity.miniconda2-py27-4.8.3-ubuntu-18.04
rename to definition-files/mkandas/miniconda/Singularity.miniconda2-py27-4.8.3-ubuntu-18.04
diff --git a/definition-files/miniconda/Singularity.miniconda3-py37-4.9.2-ubuntu-18.04 b/definition-files/mkandas/miniconda/Singularity.miniconda3-py37-4.9.2-ubuntu-18.04
similarity index 100%
rename from definition-files/miniconda/Singularity.miniconda3-py37-4.9.2-ubuntu-18.04
rename to definition-files/mkandas/miniconda/Singularity.miniconda3-py37-4.9.2-ubuntu-18.04
diff --git a/definition-files/miniconda/Singularity.miniconda3-py38-4.9.2-ubuntu-18.04 b/definition-files/mkandas/miniconda/Singularity.miniconda3-py38-4.9.2-ubuntu-18.04
similarity index 100%
rename from definition-files/miniconda/Singularity.miniconda3-py38-4.9.2-ubuntu-18.04
rename to definition-files/mkandas/miniconda/Singularity.miniconda3-py38-4.9.2-ubuntu-18.04
diff --git a/definition-files/miniconda/Singularity.miniconda3-py39-4.9.2-ubuntu-18.04 b/definition-files/mkandas/miniconda/Singularity.miniconda3-py39-4.9.2-ubuntu-18.04
similarity index 100%
rename from definition-files/miniconda/Singularity.miniconda3-py39-4.9.2-ubuntu-18.04
rename to definition-files/mkandas/miniconda/Singularity.miniconda3-py39-4.9.2-ubuntu-18.04
diff --git a/definition-files/mxnet/Singularity.mxnet-1.7.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4 b/definition-files/mkandas/mxnet/Singularity.mxnet-1.7.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
similarity index 100%
rename from definition-files/mxnet/Singularity.mxnet-1.7.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
rename to definition-files/mkandas/mxnet/Singularity.mxnet-1.7.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
diff --git a/definition-files/omb/Singularity.omb-5.6.3-centos-7.9.2009-mvapich-2.3.2 b/definition-files/mkandas/omb/Singularity.omb-5.6.3-centos-7.9.2009-mvapich-2.3.2
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.6.3-centos-7.9.2009-mvapich-2.3.2
rename to definition-files/mkandas/omb/Singularity.omb-5.6.3-centos-7.9.2009-mvapich-2.3.2
diff --git a/definition-files/omb/Singularity.omb-5.6.3-centos-7.9.2009-openmpi-3.1.4 b/definition-files/mkandas/omb/Singularity.omb-5.6.3-centos-7.9.2009-openmpi-3.1.4
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.6.3-centos-7.9.2009-openmpi-3.1.4
rename to definition-files/mkandas/omb/Singularity.omb-5.6.3-centos-7.9.2009-openmpi-3.1.4
diff --git a/definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4 b/definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
rename to definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
diff --git a/definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-mvapich-2.3.2 b/definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-mvapich-2.3.2
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-mvapich-2.3.2
rename to definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-mvapich-2.3.2
diff --git a/definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.4 b/definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.4
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.4
rename to definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.4
diff --git a/definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.6 b/definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.6
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.6
rename to definition-files/mkandas/omb/Singularity.omb-5.6.3-ubuntu-18.04-openmpi-3.1.6
diff --git a/definition-files/omb/Singularity.omb-5.7-centos-7.7.1908-cuda-11.0-openmpi-3.1.6 b/definition-files/mkandas/omb/Singularity.omb-5.7-centos-7.7.1908-cuda-11.0-openmpi-3.1.6
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-centos-7.7.1908-cuda-11.0-openmpi-3.1.6
rename to definition-files/mkandas/omb/Singularity.omb-5.7-centos-7.7.1908-cuda-11.0-openmpi-3.1.6
diff --git a/definition-files/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-3.1.6 b/definition-files/mkandas/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-3.1.6
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-3.1.6
rename to definition-files/mkandas/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-3.1.6
diff --git a/definition-files/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-4.0.5 b/definition-files/mkandas/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-4.0.5
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-4.0.5
rename to definition-files/mkandas/omb/Singularity.omb-5.7-centos-7.7.1908-openmpi-4.0.5
diff --git a/definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-cuda-11.2-openmpi-4.0.5 b/definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
rename to definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
diff --git a/definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6 b/definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
rename to definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
diff --git a/definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6 b/definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
rename to definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
diff --git a/definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-openmpi-4.0.5 b/definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-openmpi-4.0.5
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.7-ubuntu-18.04-openmpi-4.0.5
rename to definition-files/mkandas/omb/Singularity.omb-5.7-ubuntu-18.04-openmpi-4.0.5
diff --git a/definition-files/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4 b/definition-files/mkandas/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
rename to definition-files/mkandas/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
diff --git a/definition-files/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/omb/Singularity.omb-5.8-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/omb/Singularity.omb-5.8-ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4 b/definition-files/mkandas/omb/Singularity.omb-5.8-ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
similarity index 100%
rename from definition-files/omb/Singularity.omb-5.8-ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
rename to definition-files/mkandas/omb/Singularity.omb-5.8-ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
diff --git a/definition-files/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.4-osmesa-20.1.5 b/definition-files/mkandas/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.4-osmesa-20.1.5
similarity index 100%
rename from definition-files/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.4-osmesa-20.1.5
rename to definition-files/mkandas/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.4-osmesa-20.1.5
diff --git a/definition-files/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5 b/definition-files/mkandas/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5
similarity index 100%
rename from definition-files/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5
rename to definition-files/mkandas/paraview/Singularity.paraview-5.8.1-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5
diff --git a/definition-files/paraview/Singularity.paraview-5.9.0-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5 b/definition-files/mkandas/paraview/Singularity.paraview-5.9.0-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5
similarity index 100%
rename from definition-files/paraview/Singularity.paraview-5.9.0-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5
rename to definition-files/mkandas/paraview/Singularity.paraview-5.9.0-ubuntu-18.04-openmpi-3.1.6-osmesa-20.1.5
diff --git a/definition-files/pytorch/Singularity.pytorch-1.5.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4 b/definition-files/mkandas/pytorch/Singularity.pytorch-1.5.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
similarity index 100%
rename from definition-files/pytorch/Singularity.pytorch-1.5.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
rename to definition-files/mkandas/pytorch/Singularity.pytorch-1.5.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
diff --git a/definition-files/pytorch/Singularity.pytorch-1.8.1-ubuntu-18.04-cuda-11.2-openmpi-4.0.5 b/definition-files/mkandas/pytorch/Singularity.pytorch-1.8.1-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
similarity index 100%
rename from definition-files/pytorch/Singularity.pytorch-1.8.1-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
rename to definition-files/mkandas/pytorch/Singularity.pytorch-1.8.1-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
diff --git a/definition-files/pytorch/Singularity.pytorch-1.8.2-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/pytorch/Singularity.pytorch-1.8.2-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/pytorch/Singularity.pytorch-1.8.2-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/pytorch/Singularity.pytorch-1.8.2-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/singularity/Singularity.singularity-3.5.3 b/definition-files/mkandas/singularity/Singularity.singularity-3.5.3
similarity index 100%
rename from definition-files/singularity/Singularity.singularity-3.5.3
rename to definition-files/mkandas/singularity/Singularity.singularity-3.5.3
diff --git a/definition-files/spark/Singularity.spark-2.3.1-hadoop-2.7-ubuntu-18.04 b/definition-files/mkandas/spark/Singularity.spark-2.3.1-hadoop-2.7-ubuntu-18.04
similarity index 100%
rename from definition-files/spark/Singularity.spark-2.3.1-hadoop-2.7-ubuntu-18.04
rename to definition-files/mkandas/spark/Singularity.spark-2.3.1-hadoop-2.7-ubuntu-18.04
diff --git a/definition-files/spark/Singularity.spark-3.1.2-hadoop-3.2-ubuntu-18.04 b/definition-files/mkandas/spark/Singularity.spark-3.1.2-hadoop-3.2-ubuntu-18.04
similarity index 100%
rename from definition-files/spark/Singularity.spark-3.1.2-hadoop-3.2-ubuntu-18.04
rename to definition-files/mkandas/spark/Singularity.spark-3.1.2-hadoop-3.2-ubuntu-18.04
diff --git a/definition-files/stream/Singularity.stream-5.10-ubuntu-18.04 b/definition-files/mkandas/stream/Singularity.stream-5.10-ubuntu-18.04
similarity index 100%
rename from definition-files/stream/Singularity.stream-5.10-ubuntu-18.04
rename to definition-files/mkandas/stream/Singularity.stream-5.10-ubuntu-18.04
diff --git a/definition-files/tensorflow/Singularity.tensorflow-2.3.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4 b/definition-files/mkandas/tensorflow/Singularity.tensorflow-2.3.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
similarity index 100%
rename from definition-files/tensorflow/Singularity.tensorflow-2.3.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
rename to definition-files/mkandas/tensorflow/Singularity.tensorflow-2.3.0-ubuntu-18.04-cuda-10.1.168-openmpi-3.1.4
diff --git a/definition-files/tensorflow/Singularity.tensorflow-2.5.0-ubuntu-18.04-cuda-11.2-openmpi-4.0.5 b/definition-files/mkandas/tensorflow/Singularity.tensorflow-2.5.0-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
similarity index 100%
rename from definition-files/tensorflow/Singularity.tensorflow-2.5.0-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
rename to definition-files/mkandas/tensorflow/Singularity.tensorflow-2.5.0-ubuntu-18.04-cuda-11.2-openmpi-4.0.5
diff --git a/definition-files/tensorflow/Singularity.tensorflow-2.5.1-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/tensorflow/Singularity.tensorflow-2.5.1-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/tensorflow/Singularity.tensorflow-2.5.1-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/tensorflow/Singularity.tensorflow-2.5.1-ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04
new file mode 100644
index 0000000000000000000000000000000000000000..d3c518b1e8b50d15ae5bd0261bf913004eba8f70
--- /dev/null
+++ b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04
@@ -0,0 +1,99 @@
+Bootstrap: debootstrap
+MirrorURL: http://us.archive.ubuntu.com/ubuntu
+OSVersion: bionic
+
+%labels
+
+ APPLICATION_NAME ubuntu
+ APPLICATION_VERSION 18.04
+ APPLICATION_URL https://www.ubuntu.com
+
+ AUTHOR_NAME Marty Kandes
+ AUTHOR_EMAIL mkandes@sdsc.edu
+
+ LAST_UPDATED 20210112
+
+%setup
+
+%environment
+
+ # Set operating system mirror URL
+ export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+
+ # Set operating system version
+ export OSVERSION='bionic'
+
+ # Set system locale
+ export LC_ALL='C'
+
+ # Set debian frontend interface
+ export DEBIAN_FRONTEND='noninteractive'
+
+%post -c /bin/bash
+
+ # Set operating system mirror URL
+ export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+
+ # Set operating system version
+ export OSVERSION='bionic'
+
+ # Set system locale
+ export LC_ALL=C
+
+ # Set debian frontend interface
+ export DEBIAN_FRONTEND='noninteractive'
+
+ # Install system metapackages
+ apt-get -y install ubuntu-standard
+ apt-get -y install ubuntu-server
+
+ # Add repositories
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates restricted"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports restricted"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
+
+ # Upgrade all software packages to their latest versions
+ apt-get -y update && apt-get -y upgrade
+
+ # Install common packages from 'main'
+ apt-get -y install autoconf
+ apt-get -y install automake
+ apt-get -y install build-essential
+ apt-get -y install cmake
+ apt-get -y install evince
+ apt-get -y install expect
+ apt-get -y install gfortran
+ apt-get -y install libtool
+ apt-get -y install mlocate
+ apt-get -y install pkg-config
+ apt-get -y install wget
+ apt-get -y install zip
+
+ # Cleanup
+ apt-get -y autoremove --purge
+ apt-get -y clean
+
+ # Update database for mlocate
+ updatedb
+
+%files
+
+%runscript
+
+%test
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.1.168
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-10.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-cuda-11.2-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.6-1.0.1.1-openmpi-3.1.4
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-mvapich-2.3.6
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-3.1.6
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
similarity index 100%
rename from definition-files/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
rename to definition-files/mkandas/ubuntu/Singularity.ubuntu-18.04-mlnx-ofed-4.7-3.2.9.0-openmpi-4.0.5
diff --git a/definition-files/mkandas/ubuntu/Singularity.ubuntu-20.04 b/definition-files/mkandas/ubuntu/Singularity.ubuntu-20.04
new file mode 100644
index 0000000000000000000000000000000000000000..1db2f63d4c01c14d810a50074d60dd2cfd4b2624
--- /dev/null
+++ b/definition-files/mkandas/ubuntu/Singularity.ubuntu-20.04
@@ -0,0 +1,99 @@
+Bootstrap: debootstrap
+MirrorURL: http://us.archive.ubuntu.com/ubuntu
+OSVersion: focal
+
+%labels
+
+ APPLICATION_NAME ubuntu
+ APPLICATION_VERSION 20.04
+ APPLICATION_URL https://www.ubuntu.com
+
+ AUTHOR_NAME Marty Kandes
+ AUTHOR_EMAIL mkandes@sdsc.edu
+
+ LAST_UPDATED 20210223
+
+%setup
+
+%environment
+
+ # Set operating system mirror URL
+ export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+
+ # Set operating system version
+ export OSVERSION='focal'
+
+ # Set system locale
+ export LC_ALL='C'
+
+ # Set debian frontend interface
+ export DEBIAN_FRONTEND='noninteractive'
+
+%post -c /bin/bash
+
+ # Set operating system mirror URL
+ export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+
+ # Set operating system version
+ export OSVERSION='focal'
+
+ # Set system locale
+ export LC_ALL=C
+
+ # Set debian frontend interface
+ export DEBIAN_FRONTEND='noninteractive'
+
+ # Install system metapackages
+ apt-get -y install ubuntu-standard
+ apt-get -y install ubuntu-server
+
+ # Add repositories
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION} restricted"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-updates restricted"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-backports restricted"
+
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security main"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security universe"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security multiverse"
+ add-apt-repository -y "deb ${MIRRORURL} ${OSVERSION}-security restricted"
+
+ # Upgrade all software packages to their latest versions
+ apt-get -y update && apt-get -y upgrade
+
+ # Install common packages from 'main'
+ apt-get -y install autoconf
+ apt-get -y install automake
+ apt-get -y install build-essential
+ apt-get -y install cmake
+ apt-get -y install evince
+ apt-get -y install expect
+ apt-get -y install gfortran
+ apt-get -y install libtool
+ apt-get -y install mlocate
+ apt-get -y install pkg-config
+ apt-get -y install wget
+ apt-get -y install zip
+
+ # Cleanup
+ apt-get -y autoremove --purge
+ apt-get -y clean
+
+ # Update database for mlocate
+ updatedb
+
+%files
+
+%runscript
+
+%test
diff --git a/definition-files/visit/Singularity.visit-3.1.4-ubuntu-18.04-openmpi-3.1.6 b/definition-files/mkandas/visit/Singularity.visit-3.1.4-ubuntu-18.04-openmpi-3.1.6
similarity index 100%
rename from definition-files/visit/Singularity.visit-3.1.4-ubuntu-18.04-openmpi-3.1.6
rename to definition-files/mkandas/visit/Singularity.visit-3.1.4-ubuntu-18.04-openmpi-3.1.6
diff --git a/definition-files/xcrysden/Singularity.xcrysden-1.6.2-ubuntu-18.04 b/definition-files/mkandas/xcrysden/Singularity.xcrysden-1.6.2-ubuntu-18.04
similarity index 100%
rename from definition-files/xcrysden/Singularity.xcrysden-1.6.2-ubuntu-18.04
rename to definition-files/mkandas/xcrysden/Singularity.xcrysden-1.6.2-ubuntu-18.04
diff --git a/definition-files/ubuntu/Singularity.ubuntu-18.04 b/definition-files/ubuntu/Singularity.ubuntu-18.04
index d3c518b1e8b50d15ae5bd0261bf913004eba8f70..f06b74d718dcb7bc38e7564086fd334b2418b391 100644
--- a/definition-files/ubuntu/Singularity.ubuntu-18.04
+++ b/definition-files/ubuntu/Singularity.ubuntu-18.04
@@ -1,5 +1,5 @@
Bootstrap: debootstrap
-MirrorURL: http://us.archive.ubuntu.com/ubuntu
+MirrorURL: http://at.archive.ubuntu.com/ubuntu
OSVersion: bionic
%labels
@@ -18,7 +18,7 @@ OSVersion: bionic
%environment
# Set operating system mirror URL
- export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+ export MIRRORURL='http://at.archive.ubuntu.com/ubuntu'
# Set operating system version
export OSVERSION='bionic'
@@ -32,7 +32,7 @@ OSVersion: bionic
%post -c /bin/bash
# Set operating system mirror URL
- export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+ export MIRRORURL='http://at.archive.ubuntu.com/ubuntu'
# Set operating system version
export OSVERSION='bionic'
diff --git a/definition-files/ubuntu/Singularity.ubuntu-20.04 b/definition-files/ubuntu/Singularity.ubuntu-20.04
index 1db2f63d4c01c14d810a50074d60dd2cfd4b2624..a715e3385eb9582aedf63cc37f15f6cc6b97727c 100644
--- a/definition-files/ubuntu/Singularity.ubuntu-20.04
+++ b/definition-files/ubuntu/Singularity.ubuntu-20.04
@@ -1,5 +1,5 @@
Bootstrap: debootstrap
-MirrorURL: http://us.archive.ubuntu.com/ubuntu
+MirrorURL: http://at.archive.ubuntu.com/ubuntu
OSVersion: focal
%labels
@@ -18,7 +18,7 @@ OSVersion: focal
%environment
# Set operating system mirror URL
- export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+ export MIRRORURL='http://at.archive.ubuntu.com/ubuntu'
# Set operating system version
export OSVERSION='focal'
@@ -32,7 +32,7 @@ OSVersion: focal
%post -c /bin/bash
# Set operating system mirror URL
- export MIRRORURL='http://us.archive.ubuntu.com/ubuntu'
+ export MIRRORURL='http://at.archive.ubuntu.com/ubuntu'
# Set operating system version
export OSVERSION='focal'
diff --git a/install-singularity.sh b/install-singularity.sh
index cc26e9e696ec51bcbcc78ce3d669a0e87b99faf8..1247be7f9eab10a3121015c6e5e63841831f58da 100755
--- a/install-singularity.sh
+++ b/install-singularity.sh
@@ -7,7 +7,7 @@
# DESCRIPTION
#
# A bash shell utility to help you work with Singularity (and the
-# definition files within the naked-singularity repository) on your
+# definition files within the monkey-singularity repository) on your
# Linux desktop, laptop, or virtual machine.
#
# USAGE
@@ -18,14 +18,15 @@
#
# LAST UPDATED
#
-# Wednesday, Auguest 18th, 2021
+# Thursday, Nov 18th, 2021
+# Based on MKandas naked-singularity
#
# ----------------------------------------------------------------------
source log.sh
# ----------------------------------------------------------------------
-# naked::install
+# monkey::install
#
# Installs Singularity from source [or via rpm].
#
@@ -44,7 +45,7 @@ source log.sh
#
# ----------------------------------------------------------------------
-naked::install() {
+monkey::install() {
local singularity_version='3.5.3'
local go_version='1.15.6'
@@ -238,7 +239,7 @@ naked::install() {
}
# ----------------------------------------------------------------------
-# naked::uninstall
+# monkey::uninstall
#
# Removes an existing source [or rpm-based] installation of Singularity.
#
@@ -257,7 +258,7 @@ naked::install() {
#
# ----------------------------------------------------------------------
-naked::uninstall() {
+monkey::uninstall() {
local singularity_prefix='/usr/local'
local use_rpm='false'
@@ -358,7 +359,7 @@ naked::uninstall() {
}
# ----------------------------------------------------------------------
-# naked::help
+# monkey::help
#
# Prints information on how to use this script to standard output.
#
@@ -376,7 +377,7 @@ naked::uninstall() {
#
# ----------------------------------------------------------------------
-naked::help() {
+monkey::help() {
log::output 'USAGE: install-singularity.sh <command> [options] {value}'
log::output ''
@@ -386,7 +387,7 @@ naked::help() {
}
# ----------------------------------------------------------------------
-# naked::main
+# monkey::main
#
# Controls the execution of the script.
#
@@ -405,39 +406,39 @@ naked::help() {
#
# ----------------------------------------------------------------------
-naked::main() {
+monkey::main() {
- local naked_command=''
+ local monkey_command=''
# If at least one command-line argument was provided by the user,
# then start parsing the command-line arguments. Otherwise, throw
# an error.
if (( "${#}" > 0 )); then
- naked_command="${1}"
+ monkey_command="${1}"
shift 1
- if [[ "${naked_command}" = 'install' ]]; then
+ if [[ "${monkey_command}" = 'install' ]]; then
- naked::install "${@}"
+ monkey::install "${@}"
if [[ "${?}" -ne 0 ]]; then
log::error 'Failed to run install command.'
exit 1
fi
- elif [[ "${naked_command}" = 'uninstall' ]]; then
+ elif [[ "${monkey_command}" = 'uninstall' ]]; then
- naked::uninstall "${@}"
+ monkey::uninstall "${@}"
if [[ "${?}" -ne 0 ]]; then
log::error 'Failed to run uninstall command.'
exit 1
fi
- elif [[ "${naked_command}" = 'help' || \
- "${naked_command}" = '-h' || \
- "${naked_command}" = '--help' ]]; then
+ elif [[ "${monkey_command}" = 'help' || \
+ "${monkey_command}" = '-h' || \
+ "${monkey_command}" = '--help' ]]; then
- naked::help
+ monkey::help
if [[ "${?}" -ne 0 ]]; then
log::error 'Failed to run help command.'
exit 1
@@ -463,6 +464,6 @@ naked::main() {
# ----------------------------------------------------------------------
-naked::main "${@}"
+monkey::main "${@}"
# ======================================================================