Code Review
/
testsuite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK...
[testsuite.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
32eb5fc
..
1a73203
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-4,7
+4,7
@@
FROM ubuntu
MAINTAINER "ONAP"
LABEL name="Docker image for the ONAP Robot Testing Framework"
MAINTAINER "ONAP"
LABEL name="Docker image for the ONAP Robot Testing Framework"
-LABEL usage="docker run -e ROBOT_TEST=<testname> -ti o
penecom
pete"
+LABEL usage="docker run -e ROBOT_TEST=<testname> -ti o
na
pete"
ENV BUILDTIME=true
ENV BUILDTIME=true
@@
-28,21
+28,35
@@
RUN apt-get update \
python-setuptools \
python-wheel \
python-pip \
python-setuptools \
python-wheel \
python-pip \
+ netbase \
unzip \
x11-utils \
x11-xserver-utils \
xvfb \
xxd \
unzip \
x11-utils \
x11-xserver-utils \
xvfb \
xxd \
- vim
-
+ 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 pip install robotframework==3.1.2 \
&& python --version
+RUN python3.7 -m pip install setuptools wheel
+RUN python3.7 -m pip install virtualenv
+
# Copy the robot code
# Copy the robot code
-COPY . /var/opt/ONAP/
-COPY lighttpd.conf /etc/lighttpd/lighttpd.conf
-COPY authorization /etc/lighttpd/authorization
+COPY html/ /var/opt/ONAP/html
+COPY robot/ /var/opt/ONAP/robot
+COPY *.sh /var/opt/ONAP/
+COPY docker/lighttpd.conf /etc/lighttpd/lighttpd.conf
+COPY docker/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 \
RUN chmod 777 /var/opt/ONAP/setup.sh \
&& chmod 777 /var/opt/ONAP/runTags.sh \
&& chmod 777 /var/opt/ONAP/dnstraffic.sh \