Skip to content

Commit 6f29e4f

Browse files
author
Hoisko Sakari.M 10802213
committed
Minor modifications
1 parent 145c71a commit 6f29e4f

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
networks:
1616
- testapp
1717
environment:
18-
- RESOLUTION=1027x768
18+
- RESOLUTION=1920x1080
1919

2020
javafxcompile:
2121
build:

docker/robot-javafx-demo/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ RUN apt-get -qq update && apt-get dist-upgrade -y && apt-get install -qq --no-i
2121
openjfx \
2222
&& apt-get clean && rm -rf /var/lib/apt/lists/*
2323

24+
COPY test.sh /bin/test.sh
2425
RUN pip install --no-cache-dir \
25-
robotframework
26+
robotframework && chmod 555 /bin/test.sh
2627

28+
# JUST VNC
2729
#COPY entrypoint.sh /entrypoint.sh
28-
COPY test.sh /bin/test.sh
29-
RUN chmod 555 /bin/test.sh
3030
#RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd && chmod 555 /entrypoint.sh /bin/test.sh
31-
EXPOSE 5900 6080
3231
#ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]
32+
33+
EXPOSE 5900 80
3334
ENTRYPOINT ["/startup.sh"]

0 commit comments

Comments
 (0)