diff --git a/Dockerfile b/Dockerfile index d9a641386584eb7fda24e7913c90daf10cd6d08b..f5fc3c593303780d83ca4a96f827cad174311aae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN useradd nscuser --shell /bin/bash WORKDIR /usr/local/src RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git WORKDIR /usr/local/src/nscjekyllsetup -RUN git checkout 'v1.08' +RUN git checkout 'v1.09' RUN bash presetup.sh RUN bash setup.sh USER nscuser diff --git a/setup.sh b/setup.sh index 7e25cfebb6334bb1e722cdb6bef1903b66712c01..d712263cb90b6ce415a0eeb4d08af910da7c3872 100644 --- a/setup.sh +++ b/setup.sh @@ -8,7 +8,8 @@ popd git clone https://github.com/sstephenson/ruby-build.git rbenv/plugins/ruby-build pushd rbenv/plugins/ruby-build git checkout 476d09b66a14392989c3c65793428742e1d9f951 -PATH=/usr/local/src/rbenv/bin:$PATH +export PATH=/usr/local/src/rbenv/bin:$PATH +export RBENV_ROOT=/usr/local/src/rbenv eval "$(rbenv init -)" rbenv install 2.4.1 rbenv global 2.4.1 @@ -22,4 +23,4 @@ gem update -f rdoc ri gem update gem install -v 3.5.2 jekyll gem install pandoc-ruby pygments.rb RedCloth jekyll-feed jekyll-paginate jekyll-paginate-multiple jekyll-redirect-from jekyll-sitemap -chmod +R ugo+rx /usr/local/src +chmod -R ugo+rx /usr/local/src