Taked noVNC to use, just browser needed to remote desctop connection

Author: Hoisko Sakari.M 10802213

README.md

@@ -79,22 +79,20 @@ java -cp "target/javafxlibrary-<version>.jar"  org.robotframework.RobotFramework
 
 ## Remote library demo with Docker
 ### Requirements:
-* VNC viewer e.g. https://www.realvnc.com/en/connect/download/viewer/
 * Docker CE: https://docs.docker.com/install/
 * Docker-compose: https://docs.docker.com/compose/install/
-* VNC port: vnc://localhost:5900
+* Port 80 is free in your machine
 
 ### Running the demo with testing env
 1. Build & Start Dockerized Environment: `docker-compose up -d robot-framework javafxcompile`
-2. Take VNC connection to: <i>vnc://<docker_daemon_ip>:5900</i>
-3. Password is: 1234
-4. Open shell by right clicking in VNC desktop and selecting Applications > Shells > Bash
-5. Execute tests: `test.sh`
+2. Open browser to <docker_daemon_ip>
+3. Open xterm from start menu > System tools > xterm
+4. Execute tests in xterm window: `test.sh`
 
 FYI:
-Single testcase execution in locale and remote (replace spaces with _ ):<br>
-`test.sh all '--include tag_name' '-t test_case_name'`<br>
-Single suite execution in locale and remote (replace spaces with _ ):<br>
-`test.sh all '--include tag_name' '-s suite_name'`
+Single testcase execution in locale|remote|all (replace spaces in testcase name with _ ):<br>
+`test.sh locale '--include tag_name' '-t test_case_name'`<br>
+Single suite execution in locale and remote (replace spacesin test suite name with _ ):<br>
+`test.sh remote '--include tag_name' '-s suite_name'`
 <br>
 NOTE: smoke tag is default included.

docker-compose.yml

@@ -5,14 +5,17 @@ services:
     build:
       context: ./docker/robot-javafx-demo
     ports:
-      - '5900:5900'
+      #- '5900:5900'
+      - '80:80'
     volumes:
       - './src/test/robotframework/:/robot'
       - screen-thing:/tmp/.X11-unix
       - './src/:/src' # ScreenCapturingTest.robot require this.
       - javafxbinaryshare:/javafxbinary
     networks:
       - testapp
+    environment:
+      - RESOLUTION=1027x768
 
   javafxcompile:
     build:
@@ -27,7 +30,7 @@ services:
       - screen-thing:/tmp/.X11-unix
       - javafxbinaryshare:/javafxbinary
     environment:
-      - DISPLAY=:20.0
+      - DISPLAY=:1
 
 #  javafxrelease:
 #    build:

docker/robot-javafx-demo/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM dorowu/ubuntu-desktop-lxde-vnc
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -24,9 +24,10 @@ RUN apt-get -qq update && apt-get dist-upgrade -y  && apt-get install -qq --no-i
 RUN pip install --no-cache-dir \
   robotframework
 
-COPY entrypoint.sh /entrypoint.sh
+#COPY entrypoint.sh /entrypoint.sh
 COPY test.sh /bin/test.sh
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd && chmod 555 /entrypoint.sh /bin/test.sh
-EXPOSE 5900
-
-ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]
+RUN chmod 555 /bin/test.sh
+#RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd && chmod 555 /entrypoint.sh /bin/test.sh
+EXPOSE 5900 6080
+#ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]
+ENTRYPOINT ["/startup.sh"]