X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=786538a805b6a07df046a90b283bda420b4f9417;hb=c0cf6a4765212cc66e364fa0eb43a2447366ce5b;hp=19e5c7d2effdb045777df0f62df97ed446caff9b;hpb=c79c8279e1100171fd0cd5833e6a1d89f2edfe16;p=testsuite.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 19e5c7d2..786538a8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,38 +1,60 @@
 FROM ubuntu
 ## Be careful of Windows newlines
 
-MAINTAINER "OpenECOMP"
-
-LABEL name="Docker image for the OpenECOMP Robot Testing Framework"
-LABEL usage="docker run -e ROBOT_TEST=<testname> -ti openecompete"
-
-# Install Python Pip, Robot framework, firefox, lighttpd web server, wget
-RUN apt-get update && \
-    apt-get --assume-yes install python=2.7.11-1 && \
-    apt-get --assume-yes install python-pip dbus xvfb lighttpd wget git net-tools dnsutils unzip && \
-    apt-get --assume-yes install libxss1 libappindicator1 libindicator7 build-essential libssl-dev libffi-dev python-dev && \
-    pip install --upgrade pip && \
-    pip install robotframework  && \
-    python --version
-
-# Install chrome
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
-    echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list  && \
-    apt-get update && \
-    apt-get --assume-yes install google-chrome-stable
+MAINTAINER "ONAP"
+
+LABEL name="Docker image for the ONAP Robot Testing Framework"
+LABEL usage="docker run -e ROBOT_TEST=<testname> -ti onapete"
+
+ENV BUILDTIME=true
+
+# Install Python, Pip, Robot framework, chromium, lighttpd web server
+RUN apt-get update \
+    && apt-get install \
+        --no-install-recommends \
+        --assume-yes \
+            chromium-browser \
+            chromium-chromedriver \
+            dnsutils \
+            git \
+            gcc \
+            libffi-dev \
+            libssl-dev \
+            lighttpd \
+            make \
+            net-tools \
+            python2.7 \
+            python-dev \
+            python-setuptools \
+            python-wheel \
+            python-pip \
+            unzip \
+            x11-utils \
+            x11-xserver-utils \
+            xvfb \
+            xxd  \
+            vim
+            
+
+RUN pip install robotframework==3.1.2 \
+    && python --version
 
 # Copy the robot code
-COPY / /var/opt/OpenECOMP_ETE/
+COPY . /var/opt/ONAP/
 COPY lighttpd.conf /etc/lighttpd/lighttpd.conf
-RUN chmod 777 /var/opt/OpenECOMP_ETE/setup.sh
-RUN chmod 777 /var/opt/OpenECOMP_ETE/runTags.sh
-RUN chmod 777 /var/opt/OpenECOMP_ETE/dnstraffic.sh
-RUN chmod 777 /var/opt/OpenECOMP_ETE/runSoak.sh
-RUN chmod 777 /var/opt/OpenECOMP_ETE/runEteTag.sh
-
-# Update the ssh library so that it will run properly in the docker env
-RUN cd /var/opt/OpenECOMP_ETE && ./setup.sh
-RUN apt-get clean
+COPY authorization /etc/lighttpd/authorization
+RUN chmod 777 /var/opt/ONAP/setup.sh \
+    && chmod 777 /var/opt/ONAP/runTags.sh \
+    && chmod 777 /var/opt/ONAP/dnstraffic.sh \
+    && chmod 777 /var/opt/ONAP/runSoak.sh \
+    && chmod 777 /var/opt/ONAP/runEteTag.sh \
+    && chmod 600 /var/opt/ONAP/robot/assets/keys/* 
+
+RUN cd /var/opt/ONAP \
+    && ./setup.sh \
+    && apt-get autoremove --assume-yes \
+    && rm -rf /var/lib/apt/lists/*  \
+    && apt-get clean
 
 CMD ["lighttpd", "-D", "-f",  "/etc/lighttpd/lighttpd.conf"]