From 6df6ed4f67bb86e2fbb08ed8e93336941e858180 Mon Sep 17 00:00:00 2001
From: Prashanth Dwarakanath <pchengi@nsc.liu.se>
Date: Tue, 20 Mar 2018 19:22:33 +0100
Subject: [PATCH] change installation location to /opt from /usr/local/src
---
Dockerfile | 8 ++++----
README.md | 6 +++---
compile.sh | 2 +-
presetup.sh | 2 +-
rubyenv | 4 ++--
setup.sh | 8 ++++----
singularity/Singularity | 4 ++--
singularity/docker-to-singularity/Singularity | 2 +-
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b9df14e..fd03639 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 /usr/local/src
+WORKDIR /opt
RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /usr/local/src/nscjekyllsetup
-RUN git checkout 'v1.11'
+WORKDIR /opt/nscjekyllsetup
+RUN git checkout 'v1.12'
RUN bash presetup.sh
RUN bash setup.sh
USER nscuser
-WORKDIR /usr/local/src/nscjekyllsetup
+WORKDIR /opt/nscjekyllsetup
ENTRYPOINT /bin/bash
diff --git a/README.md b/README.md
index 35cd038..54c3761 100644
--- a/README.md
+++ b/README.md
@@ -68,13 +68,13 @@ sudo singularity build nscjekyll.simg Singularity
- To simply compile pages (such as via a script)
```
-singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash /usr/local/src/nscjekyllsetup/compile.sh nsc
+singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash /opt/nscjekyllsetup/compile.sh nsc
```
- Run the jekyll web server, to serve pages, you could do one of the following:
```
singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash
-source /usr/local/src/nscjekyllsetup/rubyenv nsc
+source /opt/nscjekyllsetup/rubyenv nsc
cd /mnt
jekyll serve --watch
```
@@ -82,7 +82,7 @@ jekyll serve --watch
or
```
singularity shell nscjekyll.simg
-source /usr/local/src/nscjekyllsetup/rubyenv nsc
+source /opt/nscjekyllsetup/rubyenv nsc
cd <checked-out nscweb directory>
jekyll serve --watch
```
diff --git a/compile.sh b/compile.sh
index e88611c..45e7b96 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,6 +1,6 @@
#!/bin/bash
export LANG=en_US.UTF-8
-source /usr/local/src/nscjekyllsetup/rubyenv $1
+source /opt/nscjekyllsetup/rubyenv $1
cd /mnt
jekyll build;
exit $?;
diff --git a/presetup.sh b/presetup.sh
index 8c6d3fe..a08c16e 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'=/usr/local/src/rbenv
+export 'RBENV_ROOT'=/opt/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 85359c0..23467be 100644
--- a/rubyenv
+++ b/rubyenv
@@ -1,5 +1,5 @@
if [ "$1" = "nsc" ]; then
- export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.1/bin:$PATH
+ export PATH=/opt/rbenv/bin:/opt/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
+ export PATH=/opt/rbenv/bin:/opt/rbenv/versions/2.4.0/bin:$PATH
fi
diff --git a/setup.sh b/setup.sh
index d712263..bd16698 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-cd /usr/local/src
+cd /opt
git clone https://github.com/sstephenson/rbenv.git rbenv
pushd rbenv
git checkout 615f8443fe947f114fb358815b50978f6ab1881c
@@ -8,8 +8,8 @@ popd
git clone https://github.com/sstephenson/ruby-build.git rbenv/plugins/ruby-build
pushd rbenv/plugins/ruby-build
git checkout 476d09b66a14392989c3c65793428742e1d9f951
-export PATH=/usr/local/src/rbenv/bin:$PATH
-export RBENV_ROOT=/usr/local/src/rbenv
+export PATH=/opt/rbenv/bin:$PATH
+export RBENV_ROOT=/opt/rbenv
eval "$(rbenv init -)"
rbenv install 2.4.1
rbenv global 2.4.1
@@ -23,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 /opt/rbenv
diff --git a/singularity/Singularity b/singularity/Singularity
index d020698..07044fd 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -3,8 +3,8 @@ From: debian
%post
apt-get update && apt-get install -y git wget gcc make libssl-dev libreadline-dev zlib1g-dev vim bzip2 locales pandoc python2.7
- mkdir -p /usr/local/src && cd /usr/local/src
+ mkdir -p /opt && cd /opt
git clone https://github.com/snic-nsc/nscjekyllsetup.git
- cd nscjekyllsetup && git checkout 'v1.11'
+ cd nscjekyllsetup && git checkout 'v1.12'
bash presetup.sh
bash setup.sh
diff --git a/singularity/docker-to-singularity/Singularity b/singularity/docker-to-singularity/Singularity
index f9352a4..494ab16 100644
--- a/singularity/docker-to-singularity/Singularity
+++ b/singularity/docker-to-singularity/Singularity
@@ -1,2 +1,2 @@
Bootstrap: docker
-From: pchengi/nscjekyll:v1.11
+From: pchengi/nscjekyll:v1.12
--
GitLab