Unverified Commit 4dce25d8 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

update some defitions files and also include hack to indicate image type in prompt

parent db71b3b9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ make
| ubuntu18.04_nvidia.def         | Ubuntu 18.04LTS with Nvidia CUDA 10.2 toolkit  |
| ubuntu18.04_intel_opencl.def   | Ubuntu 18.04LTS with Intel OpenCL runtime      |
| ubuntu20.04.def                | Ubuntu 20.04LTS with MPI == OpenMPI            |
| ------------------------------ | ---------------------------------------------- |
+10 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ From: centos:7
%post
        yum -y install epel-release
        yum -y update
        yum -y install vim-enhanced diffutils \
        yum -y install vim-enhanced \
            ccache gcc-c++ gcc-gfortran clang gdb valgrind-openmpi \
            make cmake cmake3 ninja-build patch which file git Lmod \
            libpng-devel libjpeg-devel openmpi-devel mpich-devel python-devel python36-devel \
@@ -14,6 +14,15 @@ From: centos:7
            blas-devel lapack-devel gtest-devel libyaml-devel
        yum clean all

        # set custom prompt indicating the container name
        CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh
        cat >$CUSTOM_PROMPT_ENV <<EOF
#!/bin/bash
PS1="[centos7:\u@\h] \W> "
EOF
        chmod 755 $CUSTOM_PROMPT_ENV


%environment
        LC_ALL=C
        export LC_ALL
+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,15 @@ From: centos:8
               blas-devel lapack-devel gtest-devel libyaml-devel
        dnf clean all

        # set custom prompt indicating the container name
        CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh
        cat >$CUSTOM_PROMPT_ENV <<EOF
#!/bin/bash
PS1="[centos8:\u@\h] \W> "
EOF
        chmod 755 $CUSTOM_PROMPT_ENV


%environment
        LC_ALL=C
        export LC_ALL
+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,14 @@ From: fedora:32
               blas-devel lapack-devel gtest-devel libyaml-devel
        dnf clean all

        # set custom prompt indicating the container name
        CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh
        cat >$CUSTOM_PROMPT_ENV <<EOF
#!/bin/bash
PS1="[fedora32:\u@\h] \W> "
EOF
        chmod 755 $CUSTOM_PROMPT_ENV

%environment
        # we need to reset any module variables
        # inherited from the host.
+9 −1
Original line number Diff line number Diff line
@@ -17,9 +17,17 @@ From: ubuntu:16.04
        python3-setuptools python3-virtualenv \
        enchant

        # set custom prompt indicating the container name
        CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh
        cat >$CUSTOM_PROMPT_ENV <<EOF
#!/bin/bash
PS1="[ubuntu16.04:\u@\h] \W> "
EOF
        chmod 755 $CUSTOM_PROMPT_ENV

%environment
        LC_ALL=C
        export LC_ALL

%labels
        Author akohlmey
        Author akohlmey, rbberger
Loading