update recipes

Dockerfile

@@ -6,13 +6,13 @@ RUN mkdir -p /home/nscuser/mnt
 WORKDIR /home/nscuser
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
 WORKDIR /home/nscuser/nscjekyllsetup
+RUN git checkout 'v1.02'
 RUN bash presetup.sh
 RUN chown -R nscuser:nscuser /home/nscuser
 USER nscuser
 WORKDIR /home/nscuser/nscjekyllsetup
 RUN bash setup.sh
-RUN cp compile.sh ..
-RUN cp setupnscruby ..
-RUN cp setupruby ..
-WORKDIR /home/nscuser
+USER root
+RUN bash postsetup.sh
+WORKDIR /usr/local/src/nscjekyllsetup
 ENTRYPOINT /bin/bash

compile.sh

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

postsetup.sh

+#!/bin/bash
+
+mv /home/nscuser/.rbenv /usr/local/src/
+mv /home/nscuser/nscjekyllsetup /usr/local/src

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:/home/nscuser/.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

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