X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric_robot_suite%2Fdocker%2Fric-robot%2FDockerfile;h=aa8e0a4179cfc5e1240cb7f31ec8896aa1896448;hb=refs%2Fchanges%2F63%2F6163%2F1;hp=e44a47f7e7fb85ba8a1355d9cad8e19ae8739c9d;hpb=5162e70ecb4140f217cc6838014967c2fbb19aba;p=it%2Ftest.git

diff --git a/ric_robot_suite/docker/ric-robot/Dockerfile b/ric_robot_suite/docker/ric-robot/Dockerfile
index e44a47f..aa8e0a4 100644
--- a/ric_robot_suite/docker/ric-robot/Dockerfile
+++ b/ric_robot_suite/docker/ric-robot/Dockerfile
@@ -31,12 +31,16 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ENV BUILDTIME=true
 
 # Install Python, Pip, Robot framework, chromium, lighttpd web server
+
+# temporarily removed chromium-browser and chromium-chromedriver as
+# they've moved to snaps and we don't have snapd support in this container
+# yet. This will break robot tests that depend on the browser, but we don't
+# have those in the RIC at this point anyway.
+
 RUN apt-get update \
     && apt-get install \
         --no-install-recommends \
         --assume-yes \
-            chromium-browser \
-            chromium-chromedriver \
             dnsutils \
             git \
             gcc \
@@ -47,11 +51,9 @@ RUN apt-get update \
             net-tools \
             php  \
             php-cgi \
-            python2.7 \
+            python3-pip \
             python-dev \
             python-setuptools \
-            python-wheel \
-            python-pip \
             python-redis \
             unzip \
             vim   \
@@ -61,18 +63,18 @@ RUN apt-get update \
             xxd
 
 
-RUN pip install robotframework==3.0.4 \
+RUN pip3 install robotframework==3.0.4 \
     && python --version
 
 # Copy the robot code
 
 COPY robot /var/opt/RIC/robot
-COPY red.xml /var/opt/RIC
+COPY docker/ric-robot/red.xml /var/opt/RIC
 COPY ric-python-utils /var/opt/RIC/ric-python-utils
-COPY runTags.sh /var/opt/RIC
-COPY setup.sh /var/opt/RIC
-COPY version.properties /var/opt/RIC
-COPY README.md /var/opt/RIC
+COPY docker/ric-robot/runTags.sh /var/opt/RIC
+COPY docker/ric-robot/setup.sh /var/opt/RIC
+COPY docker/ric-robot/version.properties /var/opt/RIC
+COPY docker/ric-robot/README.md /var/opt/RIC
 COPY docker/ric-robot/lighttpd.conf /etc/lighttpd/lighttpd.conf
 COPY docker/ric-robot/authorization /etc/lighttpd/authorization