From 8d5e703059abcbbd1a21f4ce4d41791437c04b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoffer=20M=C3=BCller=20Madsen?= Date: Thu, 15 Jun 2017 13:31:29 +0200 Subject: [PATCH] TeX Live! --- docker/Dockerfile | 20 +++++++++++++++----- docker/build.sh | 14 ++++++++++++++ eshell | 3 ++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7cdb58d..aa271ca 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:xenial +# Install tools RUN apt-get update RUN apt-get install -y emacs-nox openssh-server RUN apt-get install -y ruby ruby-dev build-essential libsqlite3-dev sqlite3 @@ -9,20 +10,29 @@ RUN mkdir /var/run/sshd # SSH login fix. Otherwise user is kicked off after login RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd +# Copy Emacs Shell COPY tmp/eshell /usr/bin/ +# Install Ruby gems COPY tmp/Gemfile* /tmp/ WORKDIR /tmp RUN bundle install -ENV app /app -RUN mkdir $app -COPY tmp/run_server.sh /app/ -WORKDIR $app - #ENV BUNDLE_PATH /box #ADD ../. $app +# TeX Live +ENV TEX /tex +RUN mkdir $TEX +COPY tmp/texlive $TEX +RUN echo 'export PATH=$PATH:/tex/bin/x86_64-linux' > /etc/profile.d/texlive.sh + +# Copy run_server +ENV app /app +RUN mkdir $app +COPY tmp/run_server.sh $app +WORKDIR $app + VOLUME /home EXPOSE 22 diff --git a/docker/build.sh b/docker/build.sh index d48dbd7..1ef2bb9 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,8 +1,22 @@ #!/bin/sh +ORIG_DIR=`pwd` +rm -r tmp mkdir tmp cp ../init_passwd.rb ./tmp/ cp ../run_server.sh ./tmp/ cp ../eshell ./tmp/ cp ../Gemfile* ./tmp/ + +# TeX Live +#if [ "$(uname)" == "Darwin" ]; then +# cd texlive/bin/x86_64-darwin +#elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then +# cd texlive/bin/x86_64-linux +#fi +#./tlmgr update --all +cd $ORIG_DIR +cp -r texlive ./tmp/ +rm -r tmp/texlive/bin/x86_64-darwin + docker build -t emacs-collab:latest . rm -R tmp diff --git a/eshell b/eshell index 8212ad3..fea7723 100755 --- a/eshell +++ b/eshell @@ -1,7 +1,8 @@ #!/bin/sh +. /etc/profile if [ -z $EMACS ]; then emacs --daemon /usr/bin/emacsclient -t else - /bin/sh + /bin/bash fi