Merge branch 'embedded-screenshots' of https://github.com/eficode/JavaFXLibrary

Author: psaikkonen

AUTHORS.txt

@@ -5,4 +5,5 @@ Pasi Saikkonen                 2017 -
 
 Other contributors:
 Tatu Lahtela                   Find All With Pseudo Class and Find Class keywords
-Sakari Hoisko                  Dockerized linux env with X        
+Sakari Hoisko                  Dockerized linux env with X
+Juho Lehtonen                  Optimized docker environment.

docker-compose.yml

@@ -5,12 +5,10 @@ services:
     build:
       context: ./docker/robot-javafx-demo
     ports:
-      #- '5900:5900'
       - '80:80'
     volumes:
       - './src/test/robotframework/:/robot'
       - screen-thing:/tmp/.X11-unix
-      - './src/:/src' # ScreenCapturingTest.robot require this.
       - javafxbinaryshare:/javafxbinary
     networks:
       - testapp
@@ -25,8 +23,7 @@ services:
     networks:
       - testapp
     volumes:
-      - './src/test/robotframework/:/robot' # Screen capures are saved to here "hack until remote usage copy photos to results folder"
-      - './src/:/src' # ScreenCapturingTest.robot require this.
+      - './src/test/robotframework/:/robot' # Required for executing tests from robot-framework container
       - screen-thing:/tmp/.X11-unix
       - javafxbinaryshare:/javafxbinary
     environment:

docker/robot-javafx-demo/Dockerfile

@@ -3,20 +3,12 @@ FROM dorowu/ubuntu-desktop-lxde-vnc
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -qq update && apt-get dist-upgrade -y  && apt-get install -qq --no-install-recommends --allow-unauthenticated -y \
-  dbus \
   openssh-client \
-  x11vnc \
-  xvfb \
-  bash \
   xterm \
-  fluxbox \
   python-pip \
   git \
-  nano \
   python-setuptools \
   wget \
-  xvfb \
-  xorg \
   openjdk-8-jre \
   openjfx \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -25,10 +17,6 @@ COPY test.sh /bin/test.sh
 RUN pip install --no-cache-dir \
   robotframework && chmod 555 /bin/test.sh
 
-# JUST VNC
-#COPY entrypoint.sh /entrypoint.sh
-#RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd && chmod 555 /entrypoint.sh /bin/test.sh
-#ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]
 
 EXPOSE 5900 80
 ENTRYPOINT ["/startup.sh"]