aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashmi Pujar <rashmi.pujar@bell.ca>2017-03-08 15:40:27 -0500
committerRashmi Pujar <rashmi.pujar@bell.ca>2017-03-08 15:40:27 -0500
commit49b130c5fee07da0fbe7f81cad6553c4bbb82061 (patch)
tree0cb0d57d3dd31f1d2729bb13ff99c7f4d65c80b6
parent54f57d46c990bb0d9b6f7d10be1737994e3b577d (diff)
{feature}-installer.zip not copied to docker image
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 appc containers fails to load appc feature repos. The right Maven lifecycle phase for building docker should be "package" as this creates docker-build.tar. Also, note that file permissions change added to Dockerfile is redundant now that phase is corrected. Change-Id: I5565771de5de0593de1aad25f60e4001972712c2 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
-rw-r--r--installation/appc/pom.xml2
-rw-r--r--installation/appc/src/main/docker/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index d12296c..5a0e552 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -210,7 +210,7 @@
<executions>
<execution>
<id>generate-images</id>
- <phase>generate-sources</phase>
+ <phase>package</phase>
<goals>
<goal>build</goal>
</goals>
diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 5a77060..8b2addf 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -4,8 +4,8 @@ MAINTAINER APP-C Team (appc@lists.openecomp.org)
# copy openecomp
COPY opt /opt
+
RUN ln -s /opt/openecomp/appc /opt/appc
-RUN chmod +x /opt/openecomp/appc/bin/*
# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
EXPOSE 8181