summaryrefslogtreecommitdiffstats
path: root/vio
diff options
context:
space:
mode:
authorEthan Lynn <xuanlangjian@gmail.com>2019-09-06 17:28:43 +0800
committerEthan Lynn <xuanlangjian@gmail.com>2019-09-06 17:29:22 +0800
commit5c428e9ee21dd953673d03ebfddb7bc174ffe3ba (patch)
treed7dd3ae8c3ed60e45f9d974bfc9081858928b3b0 /vio
parentf8eb83d7f0f406d79aede856b92fbc5a0461d1c3 (diff)
Use local zip to build docker image1.4.1
Use local zip to build docker image Change-Id: I8576744dca79f6e781d20539c2548df798a452d3 Issue-ID: MULTICLOUD-706 Signed-off-by: Ethan Lynn <xuanlangjian@gmail.com>
Diffstat (limited to 'vio')
-rw-r--r--vio/docker/Dockerfile3
-rw-r--r--vio/pom.xml13
2 files changed, 14 insertions, 2 deletions
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index 9af63cf..96457ec 100644
--- a/vio/docker/Dockerfile
+++ b/vio/docker/Dockerfile
@@ -14,10 +14,11 @@ EXPOSE 9004
RUN addgroup -S onap && adduser -S -G onap onap
+COPY ./multicloud-openstack-vmware-*.zip /opt/multicloud-vio.zip
RUN apk update && \
apk add uwsgi unzip wget curl gcc make libc-dev libffi-dev openssl-dev && \
cd /opt/ && \
- wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.1-SNAPSHOT&e=zip' && \
+ # wget -q -O multicloud-vio.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=multicloud-openstack-vmware&v=1.4.1-SNAPSHOT&e=zip' && \
unzip multicloud-vio.zip && \
rm -rf multicloud-vio.zip && \
pip3 install -r /opt/vio/requirements.txt && \
diff --git a/vio/pom.xml b/vio/pom.xml
index 1209357..a4698bd 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -127,17 +127,28 @@
<executions>
<execution>
<id>copy-resources</id>
- <phase>validate</phase>
+ <phase>install</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
+ <overwrite>true</overwrite>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
<outputDirectory>${project.basedir}/docker_target</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/docker</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/target</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>*.zip</include>
+ </includes>
+ </resource>
</resources>
</configuration>
</execution>