From: Lucjan Bryndza <l.bryndza@samsung.com>
Date: Wed, 11 Mar 2020 11:09:42 +0000 (+0100)
Subject: Testsuite docker build fix
X-Git-Tag: 1.6.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d63df03b8db1bd37acc2d88c6b3aac61402c90d7;p=testsuite.git

Testsuite docker build fix

Configuration files authorization and lighttpd.conf are in the
excluded docker directory in .dockerignore so the container won't build.
Copying all files also causes to copy files not used in runtime.

Signed-off-by: Lucjan Bryndza <l.bryndza@samsung.com>
Issue-ID: TEST-229
Change-Id: I3591dc686e1d2e3f1ce2982a5f6953bf02007634
---

diff --git a/.dockerignore b/.dockerignore
index 0ea94323..74055650 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
-docker/
-Dockerfile
+docker/Dockerfile
 .dockerignore
 .git/
 .gitattributes
@@ -7,4 +6,4 @@ Dockerfile
 .gitreview
 .idea/
 .project
-.pydevproject
\ No newline at end of file
+.pydevproject
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 24c63892..188a8e15 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,9 +51,11 @@ RUN python3.7 -m pip install setuptools wheel
 RUN python3.7 -m pip install virtualenv
 
 # 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 \