update all recipes

Dockerfile

@@ -2,17 +2,14 @@ FROM debian
 
 RUN apt-get update && apt-get install -y git wget gcc make libssl-dev libreadline-dev zlib1g-dev vim bzip2 locales pandoc python2.7
 RUN useradd nscuser --shell /bin/bash
-RUN mkdir -p /home/nscuser/mnt
-WORKDIR /home/nscuser
+WORKDIR /usr/local/src
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /home/nscuser/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
+RUN git checkout 'v1.01'
 RUN bash presetup.sh
-RUN chown -R nscuser:nscuser /home/nscuser
+RUN chown -R nscuser:nscuser /usr/local/src
 USER nscuser
-WORKDIR /home/nscuser/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
 RUN bash setup.sh
-RUN cp compile.sh ..
-RUN cp setupnscruby ..
-RUN cp setupruby ..
-WORKDIR /home/nscuser
+WORKDIR /usr/local/src
 ENTRYPOINT /bin/bash

compile.sh

 #!/bin/bash
-source /home/nscuser/singenv $1
-cd /mnt;
+source /usr/local/src/nscjekyllsetup/rubyenv $1
 jekyll build;
 exit $?;

presetup.sh

@@ -5,5 +5,5 @@
 echo "en_US.UTF-8 UTF-8" >/etc/locale.gen
 locale-gen
 echo 'export LANG=en_US.UTF-8' >>/etc/bash.bashrc
-echo 'export PATH=/home/nscuser/.rbenv/bin:$PATH' >>/etc/bash.bashrc
+echo 'export PATH=/usr/local/src/.rbenv/bin:$PATH' >>/etc/bash.bashrc
 ln -s /usr/bin/python2.7 /usr/bin/python

rubyenv

+if [ "$1" = "nsc" ]; then
+    export PATH=/usr/local/src/.rbenv/bin:/usr/local/src/.rbenv/versions/2.4.1/bin:$PATH
+else
+    export PATH=/usr/local/src/.rbenv/bin:/usr/local/src/.rbenv/versions/2.4.0/bin:$PATH
+fi
+cd /mnt

setup.sh

 #!/bin/bash
 
-git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
-pushd ~/.rbenv
+mkdir -p /usr/local/src
+git clone https://github.com/sstephenson/rbenv.git /usr/local/src/.rbenv
+pushd /usr/local/src/.rbenv
 git checkout 615f8443fe947f114fb358815b50978f6ab1881c
 popd
-git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
-pushd ~/.rbenv/plugins/ruby-build
+git clone https://github.com/sstephenson/ruby-build.git /usr/local/src/.rbenv/plugins/ruby-build
+pushd /usr/local/src/.rbenv/plugins/ruby-build
 git checkout 476d09b66a14392989c3c65793428742e1d9f951
-PATH=$HOME/.rbenv/bin:$PATH
+PATH=/usr/local/src/.rbenv/bin:$PATH
 eval "$(rbenv init -)"
 rbenv install 2.4.1
 rbenv global 2.4.1

setupnscruby

-export PATH="/home/nscuser/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-rbenv global 2.4.1

setupruby

-export PATH="/home/nscuser/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-rbenv global 2.4.0

singenv

-if [ "$1" = "nsc" ]; then
-    export PATH=/home/nscuser/.rbenv/bin:/home/nscuser/.rbenv/versions/2.4.1/bin:$PATH
-else
-    export PATH=/home/nscuser/.rbenv/bin:/home/nscuser/.rbenv/versions/2.4.0/bin:$PATH
-fi
-cd /mnt

singularity/Singularity

+Bootstrap: docker
+From: pchengi/nscjekyll:latest