From 05d1e18373779df333d1f1fa30cc4891a8da59a4 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Fri, 26 Jul 2019 12:48:41 -0400
Subject: Cleanup POMs and Dockerfiles

Issue-ID: OPTFRA-539

Change-Id: I94da0bc947b4cbb226c5e248c85c8d87f799c659
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-robot/docker/Dockerfile | 51 ++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'cmso-robot/docker/Dockerfile')

diff --git a/cmso-robot/docker/Dockerfile b/cmso-robot/docker/Dockerfile
index 7f8eb81..70f0578 100644
--- a/cmso-robot/docker/Dockerfile
+++ b/cmso-robot/docker/Dockerfile
@@ -5,18 +5,22 @@ MAINTAINER "CMSO"
 LABEL name="Docker image for the CMSO Robot Testing Framework"
 LABEL usage="docker run -e <testname> optf-cmso-robot"
 
-RUN apt-get update
-RUN apt-get install -y software-properties-common vim
-RUN add-apt-repository ppa:jonathonf/python-3.6
-RUN apt-get update
-RUN apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv
-
-# update pip
-RUN python3.6 -m pip install pip --upgrade
-RUN python3.6 -m pip install wheel
-
-RUN apt-get update \
-    && apt-get install \
+ARG http_proxy_arg
+ARG https_proxy_arg
+ENV HTTP_PROXY=$http_proxy_arg
+ENV HTTPS_PROXY=$https_proxy_arg
+ENV http_proxy=$HTTP_PROXY
+ENV https_proxy=$HTTPS_PROXY
+
+RUN test -n "$" && echo "Acquire::Proxy \"http://$http_proxy\";" > /etc/apt/apt.conf.d/02proxy || true && \
+    apt-get update  && \
+    apt-get install -y software-properties-common vim && \
+    add-apt-repository ppa:jonathonf/python-3.6 && \
+    apt-get update && \
+    apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv  && \
+	python3.6 -m pip install pip --upgrade && \
+    python3.6 -m pip install wheel  && \
+    apt-get install \
         --no-install-recommends \
         --assume-yes \
             chromium-browser \
@@ -30,21 +34,16 @@ COPY /onap-cmso/robot /opt/cmso-robot/robot
 COPY /onap-cmso/mocking /opt/cmso-robot/mocking
 
 COPY /onap-cmso/ete.sh /opt/cmso-robot
-RUN chmod 777 /opt/cmso-robot/ete.sh
 
-COPY /onap-cmso/server.py /opt/cmso-robot
-
-
-RUN ln -s /usr/bin/python3.6 /usr/bin/python
-RUN python --version
-RUN pip --version
-RUN pip install robotframework==3.1.1
-
-RUN pip install Flask
-RUN pip install requests
-RUN pip install selenium
-RUN pip install robotframework-sshlibrary
-RUN pip install robotframework-requests
+RUN ln -s /usr/bin/python3.6 /usr/bin/python && \
+    python --version && \
+    pip --version && \
+    pip install robotframework==3.1.1 && \
+    pip install Flask && \
+    pip install requests && \
+    pip install selenium && \
+    pip install robotframework-sshlibrary && \
+    pip install robotframework-requests
 
 ### Start up the mock server for 
 CMD ["/usr/bin/python", "/opt/cmso-robot/mocking/mock.py"]
-- 
cgit 1.2.3-korg