From b4f2f0341a89eb4527cfd74658b23d4cb0dfa082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Tue, 14 Jul 2015 23:54:40 +0200 Subject: [PATCH 1/5] Screenshot url change, website * Screenshot is now linked on gh-pages (hopes it wil be fine on docker hub) * website on gh-pages ready on http://epfl-sti.github.io/octave-x11-novnc-docker/ --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc6dc25..13de55c 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,10 @@ This docker runs GNU Octave - an open source Matlab - which provides capabilities for the numerical solution of linear and nonlinear problems, and for performing other numerical experiments. The Octave GUI have to be accessed through a browser in a noVNC windows. -![Demo Screenshot](https://github.com/epfl-sti/octave-x11-novnc-docker/blob/master/screenshot.png) +![Demo Screenshot](http://epfl-sti.github.io/octave-x11-novnc-docker/images/lorenz.png) -## About - -This container runs: +## This container runs * [Xvfb](http://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml) - X11 in a virtual framebuffer * [x11vnc](http://www.karlrunge.com/x11vnc/) - A VNC server that scrapes the above X11 server @@ -19,18 +17,23 @@ This container runs: ## How To ### With Docker + * docker pull epflsti/octave-x11-novnc-docker * docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest * firefox http://localhost:8083 ### Manual Build + * docker build -t epflsti/wine-x11-novnc-docker:latest . * docker run -p 8083:8083 -ti epflsti/wine-x11-novnc-docker:latest * firefox http://localhost:8083 * octave is launched, just launch some script e.g. my_sombrero.m +## gh-pages +Please visit the project's website on [http://epfl-sti.github.io/octave-x11-novnc-docker/](http://epfl-sti.github.io/octave-x11-novnc-docker/) + ## On DockerHub -[epflsti/octave-x11-novnc-docker/](https://registry.hub.docker.com/u/epflsti/octave-x11-novnc-docker/) +[epflsti/octave-x11-novnc-docker](https://registry.hub.docker.com/u/epflsti/octave-x11-novnc-docker/) ## Thanks Based on [wine-x11-novnc-docker](https://github.com/solarkennedy/wine-x11-novnc-docker), thanks @solarkennedy ! From 8b9b81e7bf2ebc8a0328dd3878f2949f676001aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Tue, 14 Jul 2015 23:55:40 +0200 Subject: [PATCH 2/5] Copy/Paste dummy mistake --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 13de55c..246ba3a 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ The Octave GUI have to be accessed through a browser in a noVNC windows. ### Manual Build -* docker build -t epflsti/wine-x11-novnc-docker:latest . -* docker run -p 8083:8083 -ti epflsti/wine-x11-novnc-docker:latest +* docker build -t epflsti/octave-x11-novnc-docker:latest . +* docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest * firefox http://localhost:8083 * octave is launched, just launch some script e.g. my_sombrero.m From d426956aefb70cb5474f50f95759f7414e9b277a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Wed, 15 Jul 2015 00:05:07 +0200 Subject: [PATCH 3/5] Update README.md --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 246ba3a..1bb841e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ The Octave GUI have to be accessed through a browser in a noVNC windows. ## How To -### With Docker +### With Docker Hub * docker pull epflsti/octave-x11-novnc-docker * docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest @@ -29,11 +29,13 @@ The Octave GUI have to be accessed through a browser in a noVNC windows. * firefox http://localhost:8083 * octave is launched, just launch some script e.g. my_sombrero.m -## gh-pages +## Gh-pages Please visit the project's website on [http://epfl-sti.github.io/octave-x11-novnc-docker/](http://epfl-sti.github.io/octave-x11-novnc-docker/) -## On DockerHub -[epflsti/octave-x11-novnc-docker](https://registry.hub.docker.com/u/epflsti/octave-x11-novnc-docker/) +## On DockerHub / GitHub + +* [epflsti/octave-x11-novnc-docker on DockerHub](https://registry.hub.docker.com/u/epflsti/octave-x11-novnc-docker/) +* [epfl-sti/octave-x11-novnc-docker on GitHub](https://github.com/epfl-sti/octave-x11-novnc-docker) ## Thanks -Based on [wine-x11-novnc-docker](https://github.com/solarkennedy/wine-x11-novnc-docker), thanks @solarkennedy ! +Based on [wine-x11-novnc-docker](https://github.com/solarkennedy/wine-x11-novnc-docker), thanks @solarkennedy ! From f21dead74edfdaae2ddaaa512cdd95fef742f4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Wed, 15 Jul 2015 00:07:55 +0200 Subject: [PATCH 4/5] Update README.md --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1bb841e..25ba51e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ The Octave GUI have to be accessed through a browser in a noVNC windows. ![Demo Screenshot](http://epfl-sti.github.io/octave-x11-novnc-docker/images/lorenz.png) +[... more screenshots](http://epfl-sti.github.io/octave-x11-novnc-docker/#screenshots) ## This container runs @@ -18,15 +19,16 @@ The Octave GUI have to be accessed through a browser in a noVNC windows. ### With Docker Hub -* docker pull epflsti/octave-x11-novnc-docker -* docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest -* firefox http://localhost:8083 +* `docker pull epflsti/octave-x11-novnc-docker` +* `docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest` +* `firefox http://localhost:8083` +* octave is launched, just launch some script e.g. my_sombrero.m ### Manual Build -* docker build -t epflsti/octave-x11-novnc-docker:latest . -* docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest -* firefox http://localhost:8083 +* `docker build -t epflsti/octave-x11-novnc-docker:latest .` +* `docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest` +* `firefox http://localhost:8083` * octave is launched, just launch some script e.g. my_sombrero.m ## Gh-pages From cb33fa21a9ce1e889fc681db15bca1c0e720f81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Borbo=C3=ABn?= Date: Wed, 15 Jul 2015 00:08:22 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25ba51e..0dfd8db 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,14 @@ The Octave GUI have to be accessed through a browser in a noVNC windows. * `docker pull epflsti/octave-x11-novnc-docker` * `docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest` * `firefox http://localhost:8083` -* octave is launched, just launch some script e.g. my_sombrero.m +* octave is launched, just run some script e.g. my_sombrero.m ### Manual Build * `docker build -t epflsti/octave-x11-novnc-docker:latest .` * `docker run -p 8083:8083 -ti epflsti/octave-x11-novnc-docker:latest` * `firefox http://localhost:8083` -* octave is launched, just launch some script e.g. my_sombrero.m +* octave is launched, just run some script e.g. my_sombrero.m ## Gh-pages Please visit the project's website on [http://epfl-sti.github.io/octave-x11-novnc-docker/](http://epfl-sti.github.io/octave-x11-novnc-docker/)