fix conflict

Dockerfile

@@ -2,14 +2,17 @@ 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
-WORKDIR /usr/local/src
+RUN mkdir -p /home/nscuser
+WORKDIR /home/nscuser
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /usr/local/src/nscjekyllsetup
-RUN git checkout 'v1.01'
+WORKDIR /home/nscuser/nscjekyllsetup
+RUN git checkout 'v1.02'
 RUN bash presetup.sh
-RUN chown -R nscuser:nscuser /usr/local/src
+RUN chown -R nscuser:nscuser /home/nscuser
 USER nscuser
-WORKDIR /usr/local/src/nscjekyllsetup
+WORKDIR /home/nscuser/nscjekyllsetup
 RUN bash setup.sh
-WORKDIR /usr/local/src
+USER root
+RUN bash postsetup.sh
+WORKDIR /usr/local/src/nscjekyllsetup
 ENTRYPOINT /bin/bash

postsetup.sh

+#!/bin/bash
+
+mv /home/nscuser/.rbenv /usr/local/src/
+mv /home/nscuser/nscjekyllsetup /usr/local/src

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=/usr/local/src/.rbenv/bin:$PATH' >>/etc/bash.bashrc
+echo 'export PATH=/usr/local/src/.rbenv/bin:/home/nscuser/.rbenv/bin:$PATH' >>/etc/bash.bashrc
 ln -s /usr/bin/python2.7 /usr/bin/python