From 82a8476672092427e55a0378ff2bdb599a9601f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= <nbo@X1>
Date: Tue, 9 Feb 2016 15:56:17 +0100
Subject: [PATCH] Some improvements

* phusion image upgraded to 16
* octave installed from ppa (4.0.0)
* typo
---
 Dockerfile | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 476852b..1fff3a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,11 @@
-# docker build -t epflsti/octave-x11-novnc-docker .
-# docker run -it -p 8083:8083 epflsti/octave-x11-novnc-docker
-
-FROM phusion/baseimage:0.9.16
+#
+# A dockerfile to run Octave and access it through the browser with noVNC
+#
+# BUILD DOCKER:	docker build -t epflsti/octave-x11-novnc-docker .
+# RUN DOCKER:		docker run -it -p 8083:8083 epflsti/octave-x11-novnc-docker
+# TEST DOCKER:	docker exec -it epflsti/octave-x11-novnc-docker /bin/bash
+
+FROM phusion/baseimage:0.9.18
 MAINTAINER epflsti <stiitdev@groupes.epfl.ch>
 
 # Set correct environment variables
@@ -13,13 +17,16 @@ ENV LANGUAGE en_US.UTF-8
 ENV TZ=Europe/Zurich
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-# Installing apps (Note: git is here juste in case noVNC needs it in launch.sh
+# Add the octave repo
+RUN add-apt-repository ppa:octave/stable
+
+# Installing apps (Note: git is here just in case noVNC needs it in launch.sh
 RUN apt-get update && apt-get -y install \
 	xvfb \
 	x11vnc \
 	supervisor \
-	octave \
 	fluxbox \
+	octave \
 	git-core \
 	git
 
@@ -40,8 +47,8 @@ ADD novnc /root/novnc/
 WORKDIR /scripts
 ADD ./octave_scr /scripts
 
-# Can be confiugured to set octave settings
-#COPY qt-settings /root/.config/octave/qt-settings
+# Can be configured to set octave settings
+# COPY qt-settings /root/.config/octave/qt-settings
 
 # Expose Port (Note: if you change it do it as well in surpervisord.conf)
 EXPOSE 8083