-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
-# Restructuring so we can see where it fails in the build.
-RUN apt-get update
-RUN apt-get --assume-yes install python2.7
-RUN apt-get --assume-yes install build-essential
-RUN apt-get --assume-yes install dbus
-RUN apt-get --assume-yes install dnsutils
-RUN apt-get --assume-yes install git
-RUN apt-get --assume-yes install libappindicator1
-RUN apt-get --assume-yes install libffi-dev
-RUN apt-get --assume-yes install libindicator7
-RUN apt-get --assume-yes install libssl-dev
-RUN apt-get --assume-yes install libxss1
-RUN apt-get --assume-yes install lighttpd
-RUN apt-get --assume-yes install net-tools
-RUN apt-get --assume-yes install python-dev
-RUN apt-get --assume-yes install python-pip
-RUN apt-get --assume-yes install unzip
-RUN apt-get --assume-yes install wget
-RUN apt-get --assume-yes install xvfb
-RUN pip install --upgrade pip
-RUN pip install robotframework
-RUN 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 \
+ netbase \
+ unzip \
+ x11-utils \
+ x11-xserver-utils \
+ xvfb \
+ xxd \
+ vim \
+ zip
+
+# install python 3 after so it isn't default python version
+RUN apt-get install \
+ --no-install-recommends \
+ --assume-yes \
+ python3.7 \
+ python3.7-dev \
+ python3-pip
+
+RUN pip install robotframework==3.1.2 \
+ && python --version
+
+RUN python3.7 -m pip install setuptools wheel
+RUN python3.7 -m pip install virtualenv