Merge pull request #21 from jmMeessen/springBootDemo_CLI

LGTM, Circle build is only broken due to bad debian mirrors

Author: dduportal

DemoNotes.md

@@ -0,0 +1,9 @@
+# Demo notes
+
+- download the demo program with `git clone https://github.com/jmMeessen/SpringBootDemo.git demo` while being in data.
+
+- move to demo directory and launch compile with `mvn install` 
+
+- launch the demo server with the command `java -jar target/myproject-0.0.1-SNAPSHOT.jar`
+
+- start the X2GO client and launch the web browser. Point it to `http://localhost:8080`. It will display the message "Hello MIX-IT, Happy to be in Lyon"

Dockerfile

@@ -66,6 +66,7 @@ COPY configs/idea.png /opt/idea/idea.png
 # Configure things for dockerx user
 USER dockerx
 COPY configs/lxde-main-panel /home/dockerx/.config/lxpanel/LXDE/panels/panel
+COPY configs/settings.xml /home/dockerx/.m2/settings.xml
 USER root
 COPY configs/idea.desktop /usr/share/applications/idea.desktop
 COPY configs/idea.png /opt/idea/idea.png
@@ -77,6 +78,9 @@ RUN cd /opt; wget -O - \
 
 COPY configs/firefox.desktop /usr/share/applications/firefox.desktop
 
+#install GIT
+RUN apt-get install -y --no-install-recommends git
+
 RUN chown -R dockerx:dockerx /data \
   && chmod -R 0750 /data
 

ISSUES.md

@@ -5,4 +5,7 @@
    >34b990a3e43a7e7e8a855cfee44ec59692d9362c450df378c283eee50e1c4aac
    >2015/04/12 12:19:02 Error response from daemon: Cannot start container 34b990a3e43a7e7e8a855cfee44ec59692d9362c450df378c283eee50e1c4aac: Error starting userland proxy: listen tcp 0.0.0.0:22: bind: address already in use
 
-[ ] When X11 system starts it gives an error "SSH daemon failed to open the application's public key". Accepting it by clicking on "ok" makes it continue and the mains windows starts ok 
+[ ] When X11 system starts it gives an error "SSH daemon failed to open the application's public key". Accepting it by clicking on "ok" makes it continue and the mains windows starts ok 
+
+[x] GIT n'est plus dans la box. Il était installé implicitement au paravant.
+	   

TODO.md

@@ -17,9 +17,9 @@
 
 * [ ] Test docker inside devbox
 * [ ] Faire une démo d'un dévelopement (spring boot)
-	* [ ] depot Github séparé
-	* [ ] configurer maven
-	* [ ] faire fonctionner le build maven depuis la ligne de commande
+	* [x] depot Github séparé
+	* [x] configurer maven
+	* [x] faire fonctionner le build maven depuis la ligne de commande
 	* [ ] faire fonctionner/intégrer ce projet Maven dans Intellij
 
 * [ ] remove docker-bats directory

configs/settings.xml

@@ -0,0 +1,3 @@
+<settings>
+   <localRepository>/data/mavenRepo</localRepository>
+</settings>

tests/bats/devbox-comon.bats

@@ -84,3 +84,7 @@ teardown() {
 @test "/data folder is writeable by dockerx" {
 	run_as_user_cmd_in_devbox "dockerx" touch /data/test_file
 }
+
+@test "Check GIT presence" {
+	run_as_user_cmd_in_devbox "dockerx" which git
+}