diff --git a/Dockerfile b/Dockerfile index cb3b570bb9a7dc4712dc73e48b58516472f18e17..aff74c8a9bce889056b0fe847c942f8e5f839163 100644 --- a/Dockerfile +++ b/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 diff --git a/compile.sh b/compile.sh index e159a1f6da4e1c2f13cba80c7ab70024591b66a0..160e6fdeea0e47a5eb578bff7ff086c32574ffa7 100644 --- a/compile.sh +++ b/compile.sh @@ -1,5 +1,4 @@ #!/bin/bash -source /home/nscuser/singenv $1 -cd /mnt; +source /usr/local/src/nscjekyllsetup/rubyenv $1 jekyll build; exit $?; diff --git a/postsetup.sh b/postsetup.sh new file mode 100644 index 0000000000000000000000000000000000000000..1feea275157b2346a98901364e6b75b241e27b5e --- /dev/null +++ b/postsetup.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +mv /home/nscuser/.rbenv /usr/local/src/ +mv /home/nscuser/nscjekyllsetup /usr/local/src diff --git a/presetup.sh b/presetup.sh index 627cfbb2476a835c736757d38de20fe1c7b54f8a..d3fe6fb6ea19a96b6eac74177f050fab3c76c06a 100644 --- a/presetup.sh +++ b/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 diff --git a/rubyenv b/rubyenv new file mode 100644 index 0000000000000000000000000000000000000000..ee92ca42dd68354d18a54ffe6aea047bb7bd2252 --- /dev/null +++ b/rubyenv @@ -0,0 +1,6 @@ +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 diff --git a/setupnscruby b/setupnscruby deleted file mode 100644 index 4d35977830599ceaa2fc76bfbf9da831caa366df..0000000000000000000000000000000000000000 --- a/setupnscruby +++ /dev/null @@ -1,3 +0,0 @@ -export PATH="/home/nscuser/.rbenv/bin:$PATH" -eval "$(rbenv init -)" -rbenv global 2.4.1 diff --git a/setupruby b/setupruby deleted file mode 100644 index 1d3da1a7c74becf1b0135f2058a7cfd3069928e4..0000000000000000000000000000000000000000 --- a/setupruby +++ /dev/null @@ -1,3 +0,0 @@ -export PATH="/home/nscuser/.rbenv/bin:$PATH" -eval "$(rbenv init -)" -rbenv global 2.4.0 diff --git a/singenv b/singenv deleted file mode 100644 index 7e02a8d0b0b76f22c0298f5fc5abea9eba73bd73..0000000000000000000000000000000000000000 --- a/singenv +++ /dev/null @@ -1,6 +0,0 @@ -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 diff --git a/singularity/Singularity b/singularity/Singularity new file mode 100644 index 0000000000000000000000000000000000000000..11ae75d7614aa46ae2c93785dcf31bcfb63130c9 --- /dev/null +++ b/singularity/Singularity @@ -0,0 +1,2 @@ +Bootstrap: docker +From: pchengi/nscjekyll:latest