Browse Source

Changes Bernhard

bernhardbuhl 9 months ago
parent
commit
f34883906e
4 changed files with 16 additions and 9 deletions
  1. 5 6
      Dockerfile
  2. 2 2
      Makefile
  3. 5 0
      baangt.ini
  4. 4 1
      baangt.sh

+ 5 - 6
Dockerfile

@@ -33,7 +33,7 @@ RUN apt-get update -q && \
     rm -rf /var/lib/apt/lists/*
 
 # Install Baangt
-RUN git clone -b baangt-selenium-grid-v4 https://gogs.earthsquad.global/athos/baangt && \
+RUN git clone -b master https://gogs.earthsquad.global/athos/baangt --single-branch && \
     pip3 install -r baangt/requirements.txt && \
     rm -rf baangt/browserDrivers && \
     mkdir baangt/browserDrivers && \
@@ -55,17 +55,16 @@ RUN touch /root/.vnc/passwd && \
 
 COPY start-vncserver.sh /root/
 COPY baangt.sh /root/
-COPY getdrivers.sh /root/
+COPY baangt.ini /baangt/
 RUN chmod a+x /root/start-vncserver.sh && \
     chmod a+x /root/baangt.sh && \
-    chmod a+x /root/getdrivers.sh && \
-    /root/getdrivers.sh && \
     echo "mycontainer" > /etc/hostname && \
     echo "127.0.0.1	localhost" > /etc/hosts && \
     echo "127.0.0.1	mycontainer" >> /etc/hosts
 
+WORKDIR /baangt/
+RUN python3 baangt.py --reloadDrivers=True
+
 EXPOSE 5901
 ENV USER root
 CMD [ "/root/start-vncserver.sh" ]
-
-

+ 2 - 2
Makefile

@@ -1,6 +1,6 @@
 
-REPOSITORY?=baangt/baangt-vnc
-NAME?=baangtVNC
+REPOSITORY?=baangt/baangt-seleniumgridv4-vnc
+NAME?=baangtSeleniumGridV4VNC
 TAG?=latest
 
 DOCKER = docker

+ 5 - 0
baangt.ini

@@ -0,0 +1,5 @@
+[DEFAULT]
+path = /baangt/examples
+testrun = simpleAutomationpractice.xlsx
+globals = globals_grid4.json
+position = (51, 115)

+ 4 - 1
baangt.sh

@@ -1 +1,4 @@
-python3 /baangt/baangt.py
+cd /baangt/browserDrivers
+java -jar /baangt/browserDriver/selenium-server-4.0.0-alpha-5.jar standalone &
+cd /baangt/
+python3 baangt.py