From 7a42c29037c71eb5238b00980918abc4c8aa3c3d Mon Sep 17 00:00:00 2001
From: Prashanth Dwarakanath <pchengi@nsc.liu.se>
Date: Tue, 14 Aug 2018 13:08:11 +0200
Subject: [PATCH] testing upgraded jekyll and downgraded ruby, to match NSC
 production environment

---
 Dockerfile  |  6 +++---
 compile.sh  |  2 +-
 presetup.sh |  2 +-
 rubyenv     |  4 ++--
 setup.sh    | 15 ++++++++-------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fd03639..0ee024f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,12 +2,12 @@ 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 -M --shell /bin/bash
-WORKDIR /opt
+WORKDIR /usr/local/src
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /opt/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
 RUN git checkout 'v1.12'
 RUN bash presetup.sh
 RUN bash setup.sh
 USER nscuser
-WORKDIR /opt/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
 ENTRYPOINT /bin/bash
diff --git a/compile.sh b/compile.sh
index 6b62fa5..28da385 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/nscjekyllsetup/rubyenv $1
+source /usr/local/src/nscjekyllsetup/rubyenv $1
 cd /mnt
 jekyll build;
 exit $?;
diff --git a/presetup.sh b/presetup.sh
index a08c16e..8c6d3fe 100644
--- a/presetup.sh
+++ b/presetup.sh
@@ -4,6 +4,6 @@
 echo "en_US.UTF-8 UTF-8" >/etc/locale.gen
 locale-gen
 echo 'export LANG=en_US.UTF-8' >>/etc/bash.bashrc
-export 'RBENV_ROOT'=/opt/rbenv
+export 'RBENV_ROOT'=/usr/local/src/rbenv
 echo "export PATH=$RBENV_ROOT/bin:$PATH" >>/etc/bash.bashrc
 ln -s /usr/bin/python2.7 /usr/bin/python
diff --git a/rubyenv b/rubyenv
index cd3708d..4c77f74 100644
--- a/rubyenv
+++ b/rubyenv
@@ -1,7 +1,7 @@
 export LANG=en_US.UTF-8
 export LC_CTYPE=en_US.UTF-8
 if [ "$1" = "nsc" ]; then
-    export PATH=/opt/rbenv/bin:/opt/rbenv/versions/2.4.1/bin:$PATH
+    export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.0.0p648/bin:$PATH
 else
-    export PATH=/opt/rbenv/bin:/opt/rbenv/versions/2.4.0/bin:$PATH
+    export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.0/bin:$PATH
 fi
diff --git a/setup.sh b/setup.sh
index bd16698..a8b9872 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-cd /opt
+mkdir -p /usr/local/src
+cd /usr/local/src
 git clone https://github.com/sstephenson/rbenv.git rbenv
 pushd rbenv
 git checkout 615f8443fe947f114fb358815b50978f6ab1881c
@@ -8,14 +9,14 @@ popd
 git clone https://github.com/sstephenson/ruby-build.git rbenv/plugins/ruby-build
 pushd rbenv/plugins/ruby-build
 git checkout 476d09b66a14392989c3c65793428742e1d9f951
-export PATH=/opt/rbenv/bin:$PATH
-export RBENV_ROOT=/opt/rbenv
+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
+rbenv install 2.0.0p648
+rbenv global 2.0.0p648
 gem update -f rdoc ri
 gem update
-gem install -v 2.1.1 jekyll
+gem install -v 2.5.3 jekyll
 gem install pandoc-ruby RedCloth
 rbenv install 2.4.0
 rbenv global 2.4.0
@@ -23,4 +24,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 /opt/rbenv
+chmod -R ugo+rx /usr/local/src/rbenv
-- 
GitLab