aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashmi Pujar <rashmi.pujar@bell.ca>2017-03-08 15:46:48 -0500
committerRashmi Pujar <rashmi.pujar@bell.ca>2017-03-08 15:50:33 -0500
commit6878ca9312b05400f9f1018e6e9250fa2458f0d4 (patch)
tree8b1c9905e8c79b3765709b429ec71af0bb913f3a
parent2430e07d833e366c50f758bbee09cca863220940 (diff)
{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
-rw-r--r--installation/sdnc/pom.xml2
-rw-r--r--installation/sdnc/src/main/docker/Dockerfile1
2 files changed, 1 insertions, 2 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 50b8cbea..90977fd3 100644
--- 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 f6edceeb..2e2140bc 100644
--- 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