summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2019-02-18 16:09:15 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-18 16:09:15 +0000
commit24eaf7b5afd4df8a6e126137a47184c284f50152 (patch)
tree66836023261a7710b5e8b0b1dc02f789809ba892 /docker
parent0ed1faf7c7f727177b7bf3c10b5a5105d3d45ff3 (diff)
parentf6032dfd78d59da601caad17e5cf0cba7b41b9c5 (diff)
Merge "Change OpenECOMP_ETE to ONAP"
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile20
-rw-r--r--docker/lighttpd.conf2
2 files changed, 11 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 62677af5..7795fa77 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,9 @@
FROM ubuntu
## Be careful of Windows newlines
-MAINTAINER "OpenECOMP"
+MAINTAINER "ONAP"
-LABEL name="Docker image for the OpenECOMP Robot Testing Framework"
+LABEL name="Docker image for the ONAP Robot Testing Framework"
LABEL usage="docker run -e ROBOT_TEST=<testname> -ti openecompete"
# Install Python Pip, Robot framework, firefox, lighttpd web server, wget
@@ -38,20 +38,20 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
apt-get --assume-yes install google-chrome-stable
# Copy the robot code
-COPY / /var/opt/OpenECOMP_ETE/
+COPY / /var/opt/ONAP/
COPY lighttpd.conf /etc/lighttpd/lighttpd.conf
COPY authorization /etc/lighttpd/authorization
-RUN chmod 777 /var/opt/OpenECOMP_ETE/setup.sh && \
- chmod 777 /var/opt/OpenECOMP_ETE/runTags.sh && \
- chmod 777 /var/opt/OpenECOMP_ETE/dnstraffic.sh && \
- chmod 777 /var/opt/OpenECOMP_ETE/runSoak.sh && \
- chmod 777 /var/opt/OpenECOMP_ETE/runEteTag.sh
+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
# Set mode for the SSH keys
-RUN chmod 600 /var/opt/OpenECOMP_ETE/robot/assets/keys/*
+RUN chmod 600 /var/opt/ONAP/robot/assets/keys/*
# Update the ssh library so that it will run properly in the docker env
-RUN cd /var/opt/OpenECOMP_ETE && ./setup.sh && apt-get clean
+RUN cd /var/opt/ONAP && ./setup.sh && apt-get clean
CMD ["lighttpd", "-D", "-f", "/etc/lighttpd/lighttpd.conf"]
diff --git a/docker/lighttpd.conf b/docker/lighttpd.conf
index b6fc1fb8..7fc50dbb 100644
--- a/docker/lighttpd.conf
+++ b/docker/lighttpd.conf
@@ -1,4 +1,4 @@
-server.document-root = "/var/opt/OpenECOMP_ETE/html/"
+server.document-root = "/var/opt/ONAP/html/"
server.port = 88