emacs25!

docker/Dockerfile

@@ -2,18 +2,31 @@ FROM ubuntu:xenial
 
 # Install tools
 RUN apt-get update
-RUN apt-get install -y emacs-nox openssh-server
+RUN apt-get install -y locales software-properties-common
+RUN apt-get install -y openssh-server
 RUN apt-get install -y ruby ruby-dev build-essential libsqlite3-dev sqlite3
-RUN gem install bundler
-RUN mkdir /var/run/sshd
+
+# Set the locale
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+RUN sh -c "echo -e 'LANG=en_US.UTF-8\nLC_ALL=en_US.UTF-8' > /etc/default/locale"
+
+# Install Emacs
+RUN add-apt-repository -y ppa:kelleyk/emacs
+RUN apt-get update; apt-get install -y emacs25-nox
 
 # SSH login fix. Otherwise user is kicked off after login
+RUN mkdir /var/run/sshd
 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 Emacs related files
 COPY tmp/eshell /usr/bin/
+COPY tmp/site-start.el /usr/local/share/emacs/site-lisp/site-start.el
 
 # Install Ruby gems
+RUN gem install bundler
 COPY tmp/Gemfile* /tmp/
 WORKDIR /tmp
 RUN bundle install
@@ -24,7 +37,7 @@ RUN bundle install
 # TeX Live
 ENV TEX /tex
 RUN mkdir $TEX
-COPY tmp/texlive $TEX
+#COPY tmp/texlive $TEX
 RUN echo 'export PATH=$PATH:/tex/bin/x86_64-linux' > /etc/profile.d/texlive.sh
 
 # Copy run_server

docker/build.sh

@@ -6,6 +6,7 @@ cp ../init_passwd.rb ./tmp/
 cp ../run_server.sh ./tmp/
 cp ../eshell ./tmp/
 cp ../Gemfile* ./tmp/
+cp ../site-start.el ./tmp/
 
 # TeX Live
 #if [ "$(uname)" == "Darwin" ]; then
@@ -14,9 +15,9 @@ cp ../Gemfile* ./tmp/
 #    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
+#cd $ORIG_DIR
+#cp -r texlive ./tmp/
+#rm -r tmp/texlive/bin/x86_64-darwin
 
 docker build -t emacs-collab:latest .
 rm -R tmp

eshell

@@ -1,6 +1,7 @@
 #!/bin/sh
 . /etc/profile
 if [ -z $EMACS ]; then
+  export EMACS=25
   emacs --daemon
   /usr/bin/emacsclient -t
 else

site-start.el

@@ -0,0 +1,4 @@
+(prefer-coding-system 'utf-8)
+(set-default-coding-systems 'utf-8)
+(set-terminal-coding-system 'utf-8)
+(set-keyboard-coding-system 'utf-8)