Make docker building rely on local artifacts

Change-Id: I6297a9b4f8c46b7d44fed9c5762e936cb76f7e91
Issue-ID: MULTICLOUD-702
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile
index cb30cd6..5a3f174 100644 (file)
--- a/pike/docker/Dockerfile
+++ b/pike/docker/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:2-slim
+FROM python:3-slim
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -33,13 +33,14 @@ EXPOSE 9007
 
 RUN groupadd -r onap && useradd -r -g onap onap
 
+COPY ./multicloud-openstack-pike-1.4.0-SNAPSHOT.zip /opt/multicloud-openstack-pike.zip
 RUN apt-get update && \
     apt-get install -y memcached wget unzip gcc libssl-dev && \
     cd /opt/ && \
-    wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.4.0" && \
     unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-pike.zip && \
-    pip install -r /opt/pike/requirements.txt && \
+    pip3 install -r /opt/pike/requirements.txt && \
+    pip3 install -r /opt/pike/uwsgi-requirements.txt && \
     apt-get --purge remove -y wget unzip gcc libssl-dev && \
     mkdir -p /var/log/onap/multicloud/openstack/pike && \
     chown onap:onap /var/log/onap -R && \

diff --git a/pike/pom.xml b/pike/pom.xml
index 748e1c8..96039b1 100644 (file)
--- a/pike/pom.xml
+++ b/pike/pom.xml
@@ -136,6 +136,13 @@
                                             <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>

diff --git a/pike/requirements.txt b/pike/requirements.txt
index 3c9eda4..6fbbf07 100644 (file)
--- a/pike/requirements.txt
+++ b/pike/requirements.txt
@@ -22,11 +22,11 @@ httplib2==0.13.0
 # for call openstack auth and transport api
 keystoneauth1==2.18.0
 
-#python-memcached
+# python-memcached
 python-memcached
 
-#uwsgi for parallel processing
-uwsgi
+# uwsgi for parallel processing
+# uwsgi
 
 # for unit test
 # coverage==4.2

diff --git a/pike/uwsgi-requirements.txt b/pike/uwsgi-requirements.txt
new file mode 100644 (file)
index 0000000..8d5751f
--- /dev/null
+++ b/pike/uwsgi-requirements.txt
@@ -0,0 +1,14 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# uwsgi for parallel processing
+uwsgi