From f6e5f86d339441cf7c7befa2e884bce4ac1b1bb0 Mon Sep 17 00:00:00 2001 From: Prashanth Dwarakanath <pchengi@nsc.liu.se> Date: Mon, 19 Mar 2018 13:41:15 +0100 Subject: [PATCH] update all recipes --- Dockerfile | 15 ++++++--------- compile.sh | 3 +-- presetup.sh | 2 +- rubyenv | 6 ++++++ setup.sh | 11 ++++++----- setupnscruby | 3 --- setupruby | 3 --- singenv | 6 ------ singularity/Singularity | 2 ++ 9 files changed, 22 insertions(+), 29 deletions(-) create mode 100644 rubyenv delete mode 100644 setupnscruby delete mode 100644 setupruby delete mode 100644 singenv create mode 100644 singularity/Singularity diff --git a/Dockerfile b/Dockerfile index cb3b570..3660d2c 100644 --- a/Dockerfile +++ b/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 diff --git a/compile.sh b/compile.sh index e159a1f..160e6fd 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/presetup.sh b/presetup.sh index 627cfbb..e0df64d 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:$PATH' >>/etc/bash.bashrc ln -s /usr/bin/python2.7 /usr/bin/python diff --git a/rubyenv b/rubyenv new file mode 100644 index 0000000..ee92ca4 --- /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/setup.sh b/setup.sh index 3eafc27..693b9ed 100644 --- a/setup.sh +++ b/setup.sh @@ -1,13 +1,14 @@ #!/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 diff --git a/setupnscruby b/setupnscruby deleted file mode 100644 index 4d35977..0000000 --- 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 1d3da1a..0000000 --- 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 7e02a8d..0000000 --- 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 0000000..11ae75d --- /dev/null +++ b/singularity/Singularity @@ -0,0 +1,2 @@ +Bootstrap: docker +From: pchengi/nscjekyll:latest -- GitLab