{feature}-installer.zip not copied to sdnc-img

The "generate-sources" phase assigned to
docker-maven-plugin occurs much earlier
than phase of for building and staging
*-installer zip files. This leads to
image not having any of these zip, thus
ODL inside sdnc containers fails to load
sdnc feature repos.

The right Maven lifecycle phase for building
docker should be "package" as this creates
docker-build.tar.

Also, removed the redundant file permission
change in Dockerfile

Change-Id: If951e97dd9568343a577e64a8dd9452aaf74557d
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Former-commit-id: 0aa8a5792b8e12f1423fcbe45742b3d6de330558

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 50b8cbe..90977fd 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -55,7 +55,7 @@
                                <executions>
                                        <execution>
                                                <id>generate-images</id>
-                                               <phase>generate-sources</phase>
+                                               <phase>package</phase>
                                                <goals>
                                                        <goal>build</goal>
                                                </goals>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index f6edcee..2e2140b 100644 (file)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -15,7 +15,6 @@ COPY idmlight.db.mv.db /opt/opendaylight/current
 # copy openecomp
 COPY opt /opt
 RUN ln -s /opt/openecomp/sdnc /opt/sdnc
-RUN chmod +x /opt/openecomp/sdnc/bin/*
 
 # workaround till we get proxy working
 COPY mysql.tgz /tmp