diff --git a/bin/image-load b/bin/image-load
index 2de69b85c462cdc6d522bfe8ae5a6751b155194f..f890d22e8b8b4f4ddba747028304192a772f616b 100755
--- a/bin/image-load
+++ b/bin/image-load
@@ -5,13 +5,13 @@ if [ -z "IMAGE_ROOT" ] || [ -z "IMAGE_OS" ] || [ -z "IMAGE_VERSION" ]; then
exit 1
fi
-VERSION=$(ls -t $IMAGE_ROOT | grep .simg | head -1)
+VERSION=$(ls -t $IMAGE_ROOT | grep ".sif\|.simg" | head -1)
if [ ! -d "$HOME/.singularity/images" ]; then
mkdir -p $HOME/.singularity/images
fi
-LOCAL=$(ls $HOME/.singularity/images | grep $IMAGE_OS-$IMAGE_VERSION* | head -1)
+LOCAL=$(ls $HOME/.singularity/images | grep $IMAGE_OS-$IMAGE_VERSION | head -1)
if [[ -z "$LOCAL" ]]; then
echo -ne "\e[33mPreparing image \e[0m"
diff --git a/bin/image-update b/bin/image-update
index d14e6e07a098c294e883bfe3301edc03decff0d3..9442069d3dc62b34198ba428aac6caf99c693afe 100755
--- a/bin/image-update
+++ b/bin/image-update
@@ -5,7 +5,7 @@ if [ -z "IMAGE_ROOT" ] || [ -z "IMAGE_OS" ] || [ -z "IMAGE_VERSION" ]; then
exit 1
fi
-APPS_VERSION=$(ls -t $IMAGE_ROOT | grep .simg | head -1)
+APPS_VERSION=$(ls -t $IMAGE_ROOT | grep ".sif\|.simg" | head -1)
LOCAL_VERSION=$(ls $HOME/.singularity/images | grep $IMAGE_OS-$IMAGE_VERSION* | head -1)
diff --git a/install/CENTOS6 b/install/CENTOS6
deleted file mode 100644
index ddb2a90282c865049e5663857e719433c18548ac..0000000000000000000000000000000000000000
--- a/install/CENTOS6
+++ /dev/null
@@ -1,56 +0,0 @@
-Bootstrap: docker
-From: centos:6
-
-%post
-yum -y update && yum -y upgrade
-
-# CentOS repo
-yum -y install python gcc make wget vim mc procps tcl gcc-c++ gcc-gfortran pkg-config acl acpid alsa-lib alsa-lib-devel amtu apr aspell at atk atk-devel attr audit audit-libs audit-libs-python authconfig autoconf autofs automake avahi-glib avahi-libs basesystem bash bc bind-libs bind-utils binutils binutils-devel bison bison-devel bluez-libs bridge-utils busybox bzip2 bzip2-devel bzip2-libs ca-certificates cairo cairo-devel c-ares ccid cdparanoia-libs centos-indexhtml centos-release checkpolicy chkconfig cloog-ppl compat-libcap1 compat-libstdc++-33 compat-readline5 ConsoleKit ConsoleKit-libs coolkey coreutils coreutils-libs cpio cpp cppunit cpupowerutils cpuspeed cracklib cracklib-dicts crash crda cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups cups-libs curl cvs cyrus-sasl cyrus-sasl-devel cyrus-sasl-gssapi cyrus-sasl-lib cyrus-sasl-plain dash db4 db4-cxx db4-devel db4-utils dbus dbus-devel dbus-glib dbus-glib-devel dbus-libs dbus-python dejavu-fonts-common dejavu-lgc-sans-mono-fonts dejavu-sans-mono-fonts desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs device-mapper-multipath device-mapper-multipath-libs device-mapper-persistent-data diffutils dmidecode dmraid dmraid-events dmz-cursor-themes docbook-dtds docbook-style-dsssl docbook-style-xsl docbook-utils dos2unix dosfstools dracut dracut-kernel dracut-network dump e2fsprogs e2fsprogs-devel e2fsprogs-libs ed eggdbus eject elfutils-libelf elfutils-libelf-devel elfutils-libs emacs emacs-common environment-modules ethtool expat expat-devel expect file file-devel file-libs filesystem findutils finger fipscheck fipscheck-lib flac fontconfig fontconfig-devel fontpackages-filesystem foomatic foomatic-db foomatic-db-filesystem foomatic-db-ppds freeglut freeglut-devel freetype freetype-devel ftp fuse fuse-libs gamin gamin-python gawk gcc gcc-c++ gcc-gfortran GConf2 GConf2-devel gd gdb gdbm gdbm-devel gdk-pixbuf2 gdk-pixbuf2-devel genisoimage gettext gettext-devel gettext-libs ghostscript ghostscript-fonts giflib git glib2 glib2-devel glibc glibc-common glibc-debuginfo glibc-debuginfo-common glibc-devel glibc-headers glx-utils gmp gmp-devel gnome-icon-theme gnome-keyring gnome-keyring-devel gnome-themes gnome-vfs2 gnome-vfs2-devel gnupg2 gnuplot gnuplot-common gnutls gnutls-devel gperf gpgme gpm gpm-libs grep groff grub grubby gstreamer gstreamer-plugins-base gstreamer-tools gtk2 gtk2-devel gtk2-engines gtk-doc gzip hal hal-devel hal-info hal-libs hdparm hesiod hicolor-icon-theme hunspell hwdata hwloc hwloc-devel ilmbase ImageMagick indent info initscripts iproute iptables iptables-ipv6 iptstate iputils irqbalance iscsi-initiator-utils iso-codes iw jasper-libs jwhois kbd kbd-misc kernel kernel kernel-devel kernel-firmware kernel-headers keyutils keyutils-libs keyutils-libs-devel kpartx krb5-devel krb5-libs krb5-workstation ksh lcms-libs less lftp libacl libacl-devel libaio libart_lgpl libart_lgpl-devel libasyncns libattr libattr-devel libbasicobjects libblkid libbonobo libbonobo-devel libbonoboui libbonoboui-devel libcanberra libcanberra-gtk2 libcap libcap-devel libcap-ng libcgroup libcollection libcom_err libcom_err-devel libcroco libcroco-devel libcxgb3 libcxgb4 libdaemon libdhash libdrm libdrm-devel libedit libedit-devel libevent libexif libffi libfontenc libgcc libgcj libgcrypt libgcrypt-devel libgfortran libglade2 libglade2-devel libgnome libgnomecanvas libgnomecanvas-devel libgnome-devel libgomp libgpg-error libgpg-error-devel libgsf libgsf-devel libgssglue libgudev1 libhugetlbfs libibcm libibcm-devel libibverbs libibverbs-devel libibverbs-devel-static libibverbs-utils libICE libICE-devel libicu libIDL libIDL-devel libidn libidn-devel libini_config libipa_hbac libjpeg-turbo libjpeg-turbo-devel libldb libmcpp libmlx4 libmlx5 libmng libmng-devel libmthca libmthca-static libnetfilter_conntrack libnfnetlink libnih libnl libnl-devel libnotify libogg liboil libotf libpath_utils libpcap libpciaccess libpciaccess-devel libpng libpng-devel libproxy libproxy-bin libproxy-python libref_array librsvg2 librsvg2-devel libselinux libselinux-devel libselinux-python libselinux-utils libsemanage libsepol libsepol-devel libSM libSM-devel libsndfile libss libssh2 libsss_idmap libstdc++ libstdc++-devel libsysfs libsysfs-devel libtalloc libtasn1 libtasn1-devel libtdb libtevent libthai libtheora libtiff libtiff-devel libtirpc libtool-ltdl libudev libudev-devel libunistring libusb libusb1 libusb-devel libuser libutempter libuuid libvisual libvorbis libwmf libwmf-lite libwnck libX11 libX11-common libX11-devel libXau libXau-devel libXaw libXaw-devel libxcb libxcb-devel libXcomposite libXcomposite-devel libXcursor libXcursor-devel libXdamage libXdamage-devel libXdmcp libXdmcp-devel libXext libXext-devel libXfixes libXfixes-devel libXfont libXft libXft-devel libXi libXi-devel libXinerama libXinerama-devel libxkbfile libxml2 libxml2-devel libxml2-python libXmu libXmu-devel libXp libXpm libXpm-devel libXrandr libXrandr-devel libXrender libXrender-devel libXres libXScrnSaver libXScrnSaver-devel libxslt libxslt-devel libXt libXt-devel libXtst libXtst-devel libXv libXv-devel libXxf86misc libXxf86misc-devel libXxf86vm libXxf86vm-devel lm_sensors-libs lockdev logrotate lsof lvm2 lvm2-libs lynx lzo m17n-db m17n-db-datafiles m17n-lib m2crypto m4 mailcap mailx make MAKEDEV man man-pages mc mcpp mcstrans mdadm mesa-dri1-drivers mesa-dri-drivers mesa-dri-filesystem mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel mesa-private-llvm mgetty microcode_ctl mingetty mkbootdisk mlocate module-init-tools mpfr mtools mtr mysql-libs nano nc ncurses ncurses-base ncurses-devel ncurses-libs net-snmp net-snmp-libs net-tools newt newt-python nfs-utils nfs-utils-lib nmap notification-daemon nscd nspr nspr-devel nss nss_db nss-devel nss-softokn nss-softokn-debuginfo nss-softokn-devel nss-softokn-freebl nss-softokn-freebl-devel nss-sysinit nss-tools nss-util nss-util-devel ntp ntpdate ntsysv OpenEXR-libs OpenIPMI OpenIPMI-libs openjade openjpeg-libs openldap openldap-devel openmotif openmotif22 opensp openssh openssh-clients openssh-server ORBit2 ORBit2-devel p11-kit p11-kit-trust pam pam-devel pam_krb5 pam_passwdqc pam_pkcs11 pango pango-devel paps paps-libs parted passwd patch pax pciutils pciutils-devel pciutils-libs pcmciautils pcp pcp-conf pcp-libs pcre pcsc-lite pcsc-lite-libs perf perl perl-AppConfig perl-Authen-SASL perl-Bit-Vector perl-Carp-Clan perl-CGI perl-Class-Singleton perl-Compress-Raw-Zlib perl-Compress-Zlib perl-Convert-ASN1 perl-Crypt-PasswdMD5 perl-Date-Calc perl-Date-Manip perl-DateTime perl-DBD-Pg perl-DBI perl-devel perl-Digest-HMAC perl-Digest-SHA1 perl-Error perl-ExtUtils-MakeMaker perl-ExtUtils-ParseXS perl-File-Which perl-Git perl-GSSAPI perl-HTML-Parser perl-HTML-Tagset perl-IO-Compress-Base perl-IO-Compress-Zlib perl-IO-Socket-SSL perl-JSON perl-LDAP perl-libs perl-libwww-perl perl-List-MoreUtils perl-Module-Pluggable perl-Net-LibIDN perl-Net-SSLeay perl-Net-Telnet perl-Params-Validate perl-PCP-PMDA perl-Pod-Escapes perl-Pod-Simple perl-SGMLSpm perl-Socket6 perl-String-CRC32 perl-TermReadKey perl-Test-Harness perl-Test-Simple perl-Text-Iconv perl-Time-HiRes perl-URI perl-version perl-WWW-Curl perl-XML-Filter-BufferText perl-XML-LibXML perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX perl-XML-SAX-Writer perl-XML-Simple perl-YAML-Syck pinentry pinfo pixman pixman-devel pkgconfig plymouth plymouth-core-libs plymouth-scripts pm-utils policycoreutils polkit poppler poppler-data poppler-utils popt popt-devel portreserve postfix postgresql postgresql-devel postgresql-libs postgresql-odbc ppl ppp prelink procmail procps psacct psmisc pth pulseaudio-libs pycairo pycairo-devel pygobject2 pygobject2-codegen pygobject2-devel pygobject2-doc pygpgme pygtk2 pygtk2-codegen pygtk2-devel pygtk2-doc pyOpenSSL pytalloc python python-argparse python-devel python-iniparse python-libs python-pcp python-pycurl python-setuptools python-sssdconfig python-urlgrabber qt qt3 qt-sqlite qt-x11 quota rarian rarian-compat rdate rdma readahead readline readline-devel redhat-logos redhat-lsb redhat-lsb-compat redhat-lsb-core redhat-lsb-graphics redhat-lsb-printing redhat-menus redhat-rpm-config rmt rootfiles rpcbind rpm rpm-devel rpm-libs rpm-python rp-pppoe rrdtool rsh rsync ruby ruby-libs samba samba4-libs samba-common samba-winbind samba-winbind-clients screen SDL SDL-devel sed selinux-policy setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang smartmontools snappy sos sound-theme-freedesktop sqlite sqlite-devel sssd sssd-ad sssd-client sssd-common sssd-common-pac sssd-ipa sssd-krb5 sssd-krb5-common sssd-ldap sssd-proxy startup-notification startup-notification-devel strace stunnel sudo swig symlinks sysfsutils syslinux syslinux-nonlinux sysstat system-gnome-theme system-icon-theme systemtap-devel sysvinit-tools t1lib talk tar tcl tcl-devel tcpdump tcp_wrappers tcp_wrappers-libs tcsh telnet time tk tmpwatch traceroute tree tunctl tzdata udev udftools unix2dos unixODBC unixODBC-devel unzip upstart urw-fonts usbutils usermode ustr util-linux-ng vconfig vim-common vim-enhanced vim-filesystem vim-minimal virt-what wget which wireless-tools words wpa_supplicant xcb-util xdg-utils xerces-c xerces-c-devel xinetd xkeyboard-config xml-common xmlrpc-c xmlrpc-c-client xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-font-utils xorg-x11-proto-devel xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xkb-utils xterm xz xz-libs xz-lzma-compat ypbind yp-tools yum yum-metadata-parser yum-plugin-auto-update-debug-info yum-plugin-fastestmirror yum-plugin-priorities yum-plugin-security yum-plugin-versionlock yum-utils zip zlib zlib-devel
-
-yum -y groupinstall "Development Tools"
-
-cd /tmp
-
-# OpenMPI
-wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
-tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
-./configure --prefix=/usr/local
-make -j 16
-make install
-
-# lua
-yum -y install lua lua-devel
-
-# lua posix and dependencies
-wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
-tar xvf v2.4.2.tar.gz
-cd luarocks-2.4.2
-./configure
-make build
-make install
-mkdir ~/.luarocks
-echo "fs_use_modules = false" > ~/.luarocks/config.lua
-luarocks install luaposix
-luarocks install luafilesystem
-LUAROCKS_PREFIX=/usr/local
-export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
-export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
-
-# Lmod
-wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
-tar xvf 7.7.7.tar.gz
-cd Lmod-7.7.7
-./configure --prefix=/opt/apps
-make install
-
-# APPS and SCRATCH
-mkdir /apps
-mkdir /scratch
-
-%environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
diff --git a/install/CENTOS69 b/install/CENTOS6LATEST
similarity index 100%
rename from install/CENTOS69
rename to install/CENTOS6LATEST
diff --git a/install/CENTOS7 b/install/CENTOS7
deleted file mode 100644
index fc1125a6a7f7d95ec21a05a552478ee1d82cc0a7..0000000000000000000000000000000000000000
--- a/install/CENTOS7
+++ /dev/null
@@ -1,44 +0,0 @@
-Bootstrap: docker
-From: centos:7
-
-%post
-yum -y update && yum -y upgrade
-
-# Packages
-yum -y install mc vim wget gcc make rpm-build libtool hwloc-devel libX11-devel libXt-devel libedit-devel libical-devel ncurses-devel perl postgresql-devel postgresql-contrib python-devel tcl-devel tk-devel swig expat-devel openssl-devel libXext libXft autoconf automake
-
-# pip
-curl -s -O https://bootstrap.pypa.io/get-pip.py
-python get-pip.py
-
-pip install setuptools numpy scipy pandas wheel --upgrade
-
-# lua
-wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-posix-32-2.el7.x86_64.rpm
-wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-filesystem-1.6.2-2.el7.x86_64.rpm
-wget http://mirror.centos.org/centos/7/os/x86_64/Packages/lua-devel-5.1.4-15.el7.x86_64.rpm
-wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-bitop-1.0.2-3.el7.x86_64.rpm
-
-rpm -ihv lua-devel-5.1.4-15.el7.x86_64.rpm
-rpm -ihv lua-filesystem-1.6.2-2.el7.x86_64.rpm
-rpm -ihv lua-bitop-1.0.2-3.el7.x86_64.rpm
-rpm -ihv lua-posix-32-2.el7.x86_64.rpm
-
-# Lmod
-wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
-tar xvf 7.7.7.tar.gz
-cd Lmod-7.7.7
-./configure --prefix=/opt/apps
-make install
-
-# APPS and SCRATCH
-mkdir /apps
-mkdir /scratch
-
-%environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
diff --git a/install/CENTOS77 b/install/CENTOS7LATEST
similarity index 100%
rename from install/CENTOS77
rename to install/CENTOS7LATEST
diff --git a/install/CENTOS7GPU b/install/CENTOS7LATESTGPU
similarity index 99%
rename from install/CENTOS7GPU
rename to install/CENTOS7LATESTGPU
index 090db5ffd684b939d5eeeca10ba5b981b52ae83f..e4e702f793ac1c373dec81d66f1e389e11a6673b 100644
--- a/install/CENTOS7GPU
+++ b/install/CENTOS7LATESTGPU
@@ -1,5 +1,5 @@
Bootstrap: docker
-From: centos:latest
+From: centos:7
%setup
cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
diff --git a/install/CENTOS75GPU-VARROC b/install/CENTOS7LATESTGPU-VARROC
similarity index 100%
rename from install/CENTOS75GPU-VARROC
rename to install/CENTOS7LATESTGPU-VARROC
diff --git a/install/CENTOS7INTEL b/install/CENTOS7LATESTINTEL
similarity index 99%
rename from install/CENTOS7INTEL
rename to install/CENTOS7LATESTINTEL
index 2ce7c5b5af8fb52648956bb874c3a89da292566c..28aa6dd2723c9c7ae43dad743a8978dcc5e22dd4 100644
--- a/install/CENTOS7INTEL
+++ b/install/CENTOS7LATESTINTEL
@@ -1,5 +1,5 @@
Bootstrap: docker
-From: centos:latest
+From: centos:7
%post
yum -y update && yum -y upgrade
diff --git a/install/CENTOS7MIC b/install/CENTOS7LATESTMIC
similarity index 99%
rename from install/CENTOS7MIC
rename to install/CENTOS7LATESTMIC
index 6c8e2fd715dc54a3710fca232b39f7da3020b627..ab9fd9c98a16e5cc61dee6401b7d544c2417803d 100644
--- a/install/CENTOS7MIC
+++ b/install/CENTOS7LATESTMIC
@@ -1,5 +1,5 @@
Bootstrap: docker
-From: centos:latest
+From: centos:7
%setup
cp /opt/mpss /tmp -R
diff --git a/install/CENTOS8 b/install/CENTOS8
deleted file mode 100644
index 6969a4c15c5b87e2dafb71ba56052b9f94791290..0000000000000000000000000000000000000000
--- a/install/CENTOS8
+++ /dev/null
@@ -1,41 +0,0 @@
-Bootstrap: docker
-From: centos:8
-
-%post
-yum -y update && yum -y upgrade
-
-# Packages
-yum -y install wget vim mc gcc rpm-build libtool libX11-devel libXt-devel libical-devel ncurses-devel perl postgresql-devel postgresql-contrib tcl-devel tk-devel swig expat-devel openssl-devel libXext libXft autoconf automake python2 python2-devel python36 python36-devel python2-pip python3-pip lua
-
-pip2 install setuptools numpy scipy pandas wheel --upgrade
-pip3 install setuptools numpy scipy pandas wheel --upgrade
-
-cd /tmp
-
-# lua
-wget http://centos.mirror.srv.magticom.ge/8/PowerTools/x86_64/os/Packages/lua-posix-33.3.1-9.el8.x86_64.rpm
-wget http://centos.mirror.srv.magticom.ge/8/PowerTools/x86_64/os/Packages/lua-devel-5.3.4-10.el8.x86_64.rpm
-wget http://centos.mirror.srv.magticom.ge/8/PowerTools/x86_64/os/Packages/lua-filesystem-1.6.3-7.el8.x86_64.rpm
-
-rpm -ihv lua-posix-33.3.1-9.el8.x86_64.rpm
-rpm -ihv lua-devel-5.3.4-10.el8.x86_64.rpm
-rpm -ihv lua-filesystem-1.6.3-7.el8.x86_64.rpm
-
-# Lmod
-wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
-tar xvf 7.7.7.tar.gz
-cd Lmod-7.7.7
-./configure --prefix=/opt/apps
-make install
-
-# APPS and SCRATCH
-mkdir /apps
-mkdir /scratch
-
-%environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
diff --git a/install/CENTOS80 b/install/CENTOS8LATEST
similarity index 100%
rename from install/CENTOS80
rename to install/CENTOS8LATEST
diff --git a/install/DEBIANGPU b/install/DEBIANGPU
deleted file mode 100644
index bb2a2269e3387988d6aa467ec1504abf23739f61..0000000000000000000000000000000000000000
--- a/install/DEBIANGPU
+++ /dev/null
@@ -1,95 +0,0 @@
-Bootstrap: docker
-From: debian:jessie
-
-%setup
-cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
-
-%post
-apt -y update && apt -y upgrade
-apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh
-
-curl -s -O https://bootstrap.pypa.io/get-pip.py
-python get-pip.py
-pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
-
-wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
-tar xvf v2.4.2.tar.gz
-cd luarocks-2.4.2
-./configure
-make build
-make install
-mkdir ~/.luarocks
-echo "fs_use_modules = false" > ~/.luarocks/config.lua
-luarocks install luaposix
-luarocks install luafilesystem
-LUAROCKS_PREFIX=/usr/local
-export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
-export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
-
-echo "# !/bin/bash" > /bin/logger
-echo "exit 0" >> /bin/logger
-chmod +x /bin/logger
-
-# Lmod
-wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
-tar xvf 7.7.7.tar.gz
-cd Lmod-7.7.7
-./configure --prefix=/opt/apps
-make install
-
-# OpenMPI
-wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
-tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
-./configure --prefix=/usr/local
-make -j 16
-make install
-
-# GPU
-driver_version=390.30
-driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
-sh $driver -x
-mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
-dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
-cd $dir
-ln -s libcuda.so.$driver_version libcuda.so
-ln -s libEGL.so.$driver_version libEGL.so
-ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
-ln -s libGLESv2.so.$driver_version libGLESv2.so
-ln -s libGL.so.$driver_version libGL.so
-ln -s libglx.so.$driver_version libglx.so
-ln -s libnvcuvid.so.$driver_version libnvcuvid.so
-ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
-ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
-ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
-ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
-ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
-ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
-ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
-ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
-ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
-ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
-ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
-ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
-ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
-ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
-ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
-ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
-ln -s libvdpau.so.$driver_version libvdpau.so
-ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
-ln -s libcuda.so.$driver_version libcuda.so.1
-
-cd /bin
-rm sh && ln -s /bin/bash sh
-
-# APPS and SCRATCH
-mkdir /apps
-mkdir /scratch
-
-%environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export -f ml
-export -f module
-export -f clearMT
-export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
-export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/install/DEBIAN b/install/DEBIANLATEST
similarity index 98%
rename from install/DEBIAN
rename to install/DEBIANLATEST
index 58dfc70db25b8c139005c3e921378330217195cd..d700b0b7211c7319bdb0a6669dcc520485700cdd 100644
--- a/install/DEBIAN
+++ b/install/DEBIANLATEST
@@ -1,5 +1,5 @@
Bootstrap: docker
-From: debian:jessie
+From: debian:latest
%post
apt -y update && apt -y upgrade
diff --git a/Debian/8.0-GPU/Debian-8.0-GPU-Bootstrap b/install/DEBIANLATESTGPU
similarity index 100%
rename from Debian/8.0-GPU/Debian-8.0-GPU-Bootstrap
rename to install/DEBIANLATESTGPU
diff --git a/install/FEDORA b/install/FEDORALATEST
similarity index 100%
rename from install/FEDORA
rename to install/FEDORALATEST
diff --git a/install/UBUNTUGPU b/install/UBUNTUGPU
deleted file mode 100644
index f6b5a69da1034d9b452fcc32319cab0caf4f7640..0000000000000000000000000000000000000000
--- a/install/UBUNTUGPU
+++ /dev/null
@@ -1,95 +0,0 @@
-Bootstrap: docker
-From: ubuntu:latest
-
-%setup
-cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
-
-%post
-apt -y update && apt -y upgrade
-apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh
-
-curl -s -O https://bootstrap.pypa.io/get-pip.py
-python get-pip.py
-pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
-
-wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
-tar xvf v2.4.2.tar.gz
-cd luarocks-2.4.2
-./configure
-make build
-make install
-mkdir ~/.luarocks
-echo "fs_use_modules = false" > ~/.luarocks/config.lua
-luarocks install luaposix
-luarocks install luafilesystem
-LUAROCKS_PREFIX=/usr/local
-export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
-export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
-
-echo "# !/bin/bash" > /bin/logger
-echo "exit 0" >> /bin/logger
-chmod +x /bin/logger
-
-# Lmod
-wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
-tar xvf 7.7.7.tar.gz
-cd Lmod-7.7.7
-./configure --prefix=/opt/apps
-make install
-
-# OpenMPI
-wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
-tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
-./configure --prefix=/usr/local
-make -j 16
-make install
-
-# GPU
-driver_version=390.30
-driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
-sh $driver -x
-mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
-dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
-cd $dir
-ln -s libcuda.so.$driver_version libcuda.so
-ln -s libEGL.so.$driver_version libEGL.so
-ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
-ln -s libGLESv2.so.$driver_version libGLESv2.so
-ln -s libGL.so.$driver_version libGL.so
-ln -s libglx.so.$driver_version libglx.so
-ln -s libnvcuvid.so.$driver_version libnvcuvid.so
-ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
-ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
-ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
-ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
-ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
-ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
-ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
-ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
-ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
-ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
-ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
-ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
-ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
-ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
-ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
-ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
-ln -s libvdpau.so.$driver_version libvdpau.so
-ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
-ln -s libcuda.so.$driver_version libcuda.so.1
-
-# APPS and SCRATCH
-mkdir /apps
-mkdir /scratch
-
-cd /bin
-rm sh && ln -s /bin/bash sh
-
-%environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export -f ml
-export -f module
-export -f clearMT
-export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
-export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/install/UBUNTU b/install/UBUNTULATEST
similarity index 100%
rename from install/UBUNTU
rename to install/UBUNTULATEST
diff --git a/Ubuntu/16.04-GPU/Ubuntu-16.04-GPU-Bootstrap b/install/UBUNTULATESTGPU
similarity index 100%
rename from Ubuntu/16.04-GPU/Ubuntu-16.04-GPU-Bootstrap
rename to install/UBUNTULATESTGPU
diff --git a/install/UBUNTUMIC b/install/UBUNTULATESTMIC
similarity index 100%
rename from install/UBUNTUMIC
rename to install/UBUNTULATESTMIC
diff --git a/install/install.sh b/install/install.sh
index ceb5281ad079ac3b0d21634846ddccf7d47b682e..e6771503e3ea3aa29ebbaa2b693863ace5deb6e7 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -8,12 +8,12 @@
if [[ $# -eq 0 ]]; then
printf "\e[31m
./install.sh\e[0m ... create and build singularity image
- -\e[33mi\e[0m OS (\e[33mCentOS\e[0m, \e[33mDebian\e[0m, \e[33mUbuntu\e[0m)
- -\e[33mv\e[0m Version OS (CentOS \e[33m6.9\e[0m or CentOS \e[33m7.5\e[0m, Debian \e[33m8.0\e[0m, Ubuntu \e[33m16.04\e[0m)
+ -\e[33mi\e[0m OS (\e[33mCentOS\e[0m, \e[33mUbuntu\e[0m)
+ -\e[33mv\e[0m Version OS (CentOS 6 or CentOS 7, Ubuntu latest)
-\e[33mo\e[0m OpenMPI module (default is \e[31mOpenMPI/2.1.1-GCC-6.3.0-2.27\e[0m)
-\e[33mt\e[0m \e[33mclassic\e[0m, \e[33mGPU\e[0m, \e[33mMIC\e[0m (default is \e[31mclassic\e[0m)
Example:
- \e[33m ./install.sh -i CentOS -v 6.9\e[0m
+ \e[33m ./install.sh -i CentOS -v 6\e[0m
"
echo ""
exit 0
@@ -136,7 +136,7 @@ else
fi
if [ -z "$IMAGE" ]; then
- echo -e "Please, specify singularity image (-i \e[31mCentOS\e[0m, \e[31mDebian\e[0m, \e[31mUbuntu\e[0m)"
+ echo -e "Please, specify singularity image (-i \e[31mCentOS\e[0m, \e[31mUbuntu\e[0m)"
exit 1
elif [ "$IMAGE" == "CentOS" ] || [ "$IMAGE" == "Debian" ] || [ "$IMAGE" == "Ubuntu" ]; then
echo -e "Image .................................. [\e[32mOK\e[0m]"
@@ -147,9 +147,9 @@ else
fi
if [ -z "$VERSION" ]; then
- echo -e "Please, specify OS version (-v CentOS \e[31m6.9\e[0m or CentOS \e[31m7.5\e[0m, Debian \e[31m8.0\e[0m, Ubuntu \e[31m16.04\e[0m)"
+ echo -e "Please, specify OS version (-v CentOS \e[31m6\e[0m or CentOS \e[31m7\e[0m, CentOS \e[31m8\e[0m, Ubuntu \e[31mlatest\e[0m)"
exit 1
-elif ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "6.9" ]) || ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "7.5" ]) || ([ "$IMAGE" == "Debian" ] && [ "$VERSION" == "8.0" ]) || ([ "$IMAGE" == "Ubuntu" ] && [ "$VERSION" == "16.04" ]); then
+elif ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "6" ]) || ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "7" ]) || ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "8" ]) || ([ "$IMAGE" == "Ubuntu" ] && [ "$VERSION" == "latest" ]); then
echo -e "Version ................................ [\e[32mOK\e[0m]"
else
echo -e "Version ................................ [\e[31mERROR\e[0m]"
@@ -188,30 +188,30 @@ fi
echo -e "\e[32mCreate & Build singularity image\e[0m ($IMAGE-$VERSION-$TYPE)"
if [ "$IMAGE" == "CentOS" ]; then
- if [ "$VERSION" == "6.9" ]; then
+ if [ "$VERSION" == "6" ]; then
if [ "$TYPE" == "classic" ]; then
- BOOTSTRAP="CENTOS69"
+ BOOTSTRAP="CENTOS6LATEST"
else
- BOOTSTRAP="CENTOS69$TYPE"
+ BOOTSTRAP="CENTOS6LATEST$TYPE"
+ fi
+ elif [ "$VERSION" == "8" ]; then
+ if [ "$TYPE" == "classic" ]; then
+ BOOTSTRAP="CENTOS8LATEST"
+ else
+ BOOTSTRAP="CENTOS8LATEST$TYPE"
fi
else
if [ "$TYPE" == "classic" ]; then
- BOOTSTRAP="CENTOS7"
+ BOOTSTRAP="CENTOS7LATEST"
else
- BOOTSTRAP="CENTOS7$TYPE"
+ BOOTSTRAP="CENTOS7LATEST$TYPE"
fi
fi
-elif [ "$IMAGE" == "Debian" ]; then
- if [ "$TYPE" == "classic" ]; then
- BOOTSTRAP="DEBIAN"
- else
- BOOTSTRAP="DEBIAN$TYPE"
- fi
elif [ "$IMAGE" == "Ubuntu" ]; then
if [ "$TYPE" == "classic" ]; then
- BOOTSTRAP="UBUNTU"
+ BOOTSTRAP="UBUNTULATEST"
else
- BOOTSTRAP="UBUNTU$TYPE"
+ BOOTSTRAP="UBUNTULATEST$TYPE"
fi
fi
@@ -231,8 +231,8 @@ fi
DATE=$(date +%Y%m%d%H%M%S)
-if [ -f image.img ]; then
- rm image.img || exit 1
+if [ -f image.sif ]; then
+ rm image.sif || exit 1
fi
echo "$SINGULARITY_BIN_PATH"
@@ -243,10 +243,10 @@ export PATH="$PATH:$SINGULARITY_BIN_PATH"
if [ "$TYPE" == "-MIC" ]; then
sed "s|/opt/mpss|$MPSS_PATH|" "$BOOTSTRAP" -i
- sed "s|/apps/all/OS/CentOS/6.9-MIC/rpm.tar.gz|$MIC_PATH|" "$BOOTSTRAP" -i
+ sed "s|/apps/all/OS/CentOS/6-MIC/rpm.tar.gz|$MIC_PATH|" "$BOOTSTRAP" -i
fi
-singularity build --writable image.img "$BOOTSTRAP" || CHECK_STATUS="FALSE" && CHECK_STATUS="TRUE"
+singularity build image.sif "$BOOTSTRAP" || CHECK_STATUS="FALSE" && CHECK_STATUS="TRUE"
if [ "$CHECK_STATUS" == "FALSE" ]; then
echo -e "Build image ...................................................................................................... [\e[31mFALSE\e[0m]"
@@ -258,21 +258,21 @@ else
exit 1
fi
-for i in `ls -t "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/" | grep img`;
+for i in `ls -t "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/" | grep sif`;
do
if [ "$STATE" == "True" ]; then
rm "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$i"
fi
done
-if [ -f "image.img" ]; then
+if [ -f "image.sif" ]; then
mkdir -p "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/" && chmod 0755 $IMAGE_PATH/$IMAGE/$VERSION$TYPE/ -R && chown $USER_IMAGE:$USER_IMAGE $IMAGE_PATH/$IMAGE/$VERSION$TYPE/ -R
- echo -n "Copy image to $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img .......................................... ["
- mv image.img "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
- echo -n "chown $USER_IMAGE:$USER_IMAGE $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img .............................. ["
- chown "$USER_IMAGE":"$USER_IMAGE" "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
- echo -n "chmod 0775 $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img ............................................. ["
- chmod 0775 "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
+ echo -n "Copy image to $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.sif .......................................... ["
+ mv image.sif "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.sif" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
+ echo -n "chown $USER_IMAGE:$USER_IMAGE $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.sif .............................. ["
+ chown "$USER_IMAGE":"$USER_IMAGE" "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.sif" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
+ echo -n "chmod 0775 $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.sif ............................................. ["
+ chmod 0775 "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.sif" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
echo -n "Copy bootstrap to $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION$TYPE-Bootstrap ............................................... ["
cp "$BOOTSTRAP" "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION$TYPE-Bootstrap" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
echo -n "chown $USER_IMAGE:$USER_IMAGE $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION$TYPE-Bootstrap ....................................... ["
@@ -285,7 +285,7 @@ if [ -f "image.img" ]; then
echo -e "\e[32mSuccess\e[0m (module \e[33m$IMAGE/$VERSION$TYPE\e[0m)"
exit 0
else
- echo -e "\e[31mFail (image.img not exists...)\e[0m]"
+ echo -e "\e[31mFail (image.sif not exists...)\e[0m]"
exit 1
fi
diff --git a/install/modulefile_template/centos/6.9 b/install/modulefile_template/centos/6
similarity index 100%
rename from install/modulefile_template/centos/6.9
rename to install/modulefile_template/centos/6
diff --git a/install/modulefile_template/centos/7.4 b/install/modulefile_template/centos/7
similarity index 100%
rename from install/modulefile_template/centos/7.4
rename to install/modulefile_template/centos/7
diff --git a/install/modulefile_template/centos/8 b/install/modulefile_template/centos/8
new file mode 100644
index 0000000000000000000000000000000000000000..81347020937c6428f666a1aa043083527d246963
--- /dev/null
+++ b/install/modulefile_template/centos/8
@@ -0,0 +1,19 @@
+help([[
+
+Description
+===========
+The CentOS Project is a community-driven free software effort focused on delivering a robust open source ecosystem. For users, we offer a consistent manageable platform that suits a wide variety of deployments. For open source communities, we offer a solid, predictable base to build upon, along with extensive resources to build, test, release, and maintain their code.
+We’re also expanding the availability of CentOS images across a number of vendors, providing official images for Amazon, Google, and more. For self-hosted cloud, we also provide a generic cloud-init enabled image.
+For more information about updates and improvements in CentOS 8, please check out the release notes or the release announcement in the mailing list archive.
+
+More information
+================
+ - Homepage: https://www.centos.org/
+]])
+
+whatis([[Description: The CentOS Project is a community-driven free software effort focused on delivering a robust open source ecosystem. For users, we offer a consistent manageable platform that suits a wide variety of deployments. For open source communities, we offer a solid, predictable base to build upon, along with extensive resources to build, test, release, and maintain their code.
+We’re also expanding the availability of CentOS images across a number of vendors, providing official images for Amazon, Google, and more. For self-hosted cloud, we also provide a generic cloud-init enabled image.
+For more information about updates and improvements in CentOS 8, please check out the release notes or the release announcement in the mailing list archive.
+]])
+whatis([[Homepage: https://www.centos.org/]])
+
diff --git a/install/modulefile_template/create_modulefile.sh b/install/modulefile_template/create_modulefile.sh
index 2d8b5844a63c335d21d5d70b622f04b93b4845ae..b053e5a511b2aa0661ec599e09042064ed5d9cd5 100755
--- a/install/modulefile_template/create_modulefile.sh
+++ b/install/modulefile_template/create_modulefile.sh
@@ -24,16 +24,16 @@ else
fi
if [ "$IMAGE" == "CentOS" ]; then
- if [ "$VERSION" == "6.9" ]; then
- PATH="./centos/6.9"
- elif [ "$VERSION" == "7.5" ]; then
- PATH="./centos/7.5"
+ if [ "$VERSION" == "6" ]; then
+ PATH="./centos/6"
+ elif [ "$VERSION" == "7" ]; then
+ PATH="./centos/7"
+ elif [ "$VERSION" == "8" ]; then
+ PATH="./centos/8"
else
echo "Unsupported OS Version"
exit 1
fi
-elif [ "$IMAGE" == "Debian" ]; then
- PATH="./debian/template"
elif [ "$IMAGE" == "Ubuntu" ]; then
PATH="./ubuntu/template"
else
diff --git a/install/modulefile_template/debian/template b/install/modulefile_template/debian/template
deleted file mode 100644
index 9d10200982655c56aa14b777fdb13b4e0fe9a70a..0000000000000000000000000000000000000000
--- a/install/modulefile_template/debian/template
+++ /dev/null
@@ -1,22 +0,0 @@
-help([[
-
-Description
-===========
-Ubuntu is a Debian-based Linux operating system for personal computers, tablets and smartphones, where Ubuntu Touch edition is used. It also runs network servers. That is usually with the Ubuntu Server edition, either on physical or virtual servers (such as on mainframes) or with containers, that is with enterprise-class features. It runs on the most popular architectures, including server-class ARM-based.
-
-Ubuntu is published by Canonical Ltd, who offer commercial support. It is based on free software and named after the Southern African philosophy of ubuntu (literally, 'human-ness'), which Canonical Ltd. suggests can be loosely translated as "humanity to others" or "I am what I am because of who we all are". Since Ubuntu 11.04 Natty Narwhal Ubuntu has used Unity as its default user interface for the desktop, but following the release of Ubuntu 17.10 it will move to the GNOME 3 desktop instead, as work on Unity ends. Ubuntu is the most popular operating system running in hosted environments, so–called "clouds", as it is the most popular server Linux distribution.
-
-Development of Ubuntu is led by UK-based Canonical Ltd., a company of South African entrepreneur Mark Shuttleworth. Canonical generates revenue through the sale of technical support and other services related to Ubuntu. The Ubuntu project is publicly committed to the principles of open-source software development; people are encouraged to use free software, study how it works, improve upon it, and distribute it.
-
-More information
-================
- - Homepage: https://www.ubuntu.com/
-]])
-
-whatis([[Description: Ubuntu is a Debian-based Linux operating system for personal computers, tablets and smartphones, where Ubuntu Touch edition is used. It also runs network servers. That is usually with the Ubuntu Server edition, either on physical or virtual servers (such as on mainframes) or with containers, that is with enterprise-class features. It runs on the most popular architectures, including server-class ARM-based.
-
-Ubuntu is published by Canonical Ltd, who offer commercial support. It is based on free software and named after the Southern African philosophy of ubuntu (literally, 'human-ness'), which Canonical Ltd. suggests can be loosely translated as "humanity to others" or "I am what I am because of who we all are". Since Ubuntu 11.04 Natty Narwhal Ubuntu has used Unity as its default user interface for the desktop, but following the release of Ubuntu 17.10 it will move to the GNOME 3 desktop instead, as work on Unity ends. Ubuntu is the most popular operating system running in hosted environments, so–called "clouds", as it is the most popular server Linux distribution.
-
-Development of Ubuntu is led by UK-based Canonical Ltd., a company of South African entrepreneur Mark Shuttleworth. Canonical generates revenue through the sale of technical support and other services related to Ubuntu. The Ubuntu project is publicly committed to the principles of open-source software development; people are encouraged to use free software, study how it works, improve upon it, and distribute it.]])
-whatis([[Homepage: https://www.ubuntu.com/]])
-