From 675c0a86ab3570a58990ff7036feb3a291baee11 Mon Sep 17 00:00:00 2001
From: Prashanth Dwarakanath <pchengi@nsc.liu.se>
Date: Mon, 19 Mar 2018 19:40:14 +0100
Subject: [PATCH] minor tweaks
---
Dockerfile | 2 +-
compile.sh | 1 +
rubyenv | 1 -
singularity/Singularity | 10 +++++++++-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 5eca9df..b9df14e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN useradd nscuser -M --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.10'
+RUN git checkout 'v1.11'
RUN bash presetup.sh
RUN bash setup.sh
USER nscuser
diff --git a/compile.sh b/compile.sh
index ae515a2..e88611c 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,5 +1,6 @@
#!/bin/bash
export LANG=en_US.UTF-8
source /usr/local/src/nscjekyllsetup/rubyenv $1
+cd /mnt
jekyll build;
exit $?;
diff --git a/rubyenv b/rubyenv
index 2322e19..85359c0 100644
--- a/rubyenv
+++ b/rubyenv
@@ -3,4 +3,3 @@ if [ "$1" = "nsc" ]; then
else
export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.0/bin:$PATH
fi
-cd /mnt
diff --git a/singularity/Singularity b/singularity/Singularity
index 11ae75d..d020698 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -1,2 +1,10 @@
Bootstrap: docker
-From: pchengi/nscjekyll:latest
+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
+ git clone https://github.com/snic-nsc/nscjekyllsetup.git
+ cd nscjekyllsetup && git checkout 'v1.11'
+ bash presetup.sh
+ bash setup.sh
--
GitLab