summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorabhishek bajaj <abhishek.kumar.bajaj@huawei.com>2021-07-12 11:37:05 +0530
committerabhishek bajaj <abhishek.kumar.bajaj@huawei.com>2021-07-12 11:37:05 +0530
commit588272759296eaa280a42b175dc2ff7af76b9009 (patch)
tree61bcd489f22bf188bbb002034cae88392f645fc5
parentf14f22fcc9016a41e9bca5770009774cab7db672 (diff)
Failed to fetch huawei:latest image running jenkins job
Issue-ID: VFC-1864 Signed-off-by: abhishek bajaj <abhishek.kumar.bajaj@huawei.com> Change-Id: Ie59a42a00ff4469c03cfd8fc7bde7ee6e6c2bb9a
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile7
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh2
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/requirements.txt21
3 files changed, 25 insertions, 5 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
index 7f0fb6eb..11161ae8 100644
--- a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
@@ -12,10 +12,9 @@ ENV pkg_verison=${PKG_VERSION}
ADD . /service
WORKDIR /service
-RUN bash docker-env-config.sh
-VOLUME /var/lib/mysql
-
+RUN sh /service/docker-env-config.sh
EXPOSE 8482
USER onap
-ENTRYPOINT /service/docker-entrypoint.sh
+WORKDIR /service
+ENTRYPOINT /docker/docker-entrypoint.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh b/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh
index c82b81a8..7c630937 100644
--- a/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/docker-env-config.sh
@@ -12,7 +12,7 @@ install_sf(){
rm -f nfvo-driver-vnfm-huawei.zip
wait
pip install --upgrade setuptools pip
- pip install --no-cache-dir --pre -r /service/vfc/nfvo/driver/vnfm/svnfm/huawei/vnfmadapter/requirements.txt
+ pip install --no-cache-dir --pre -r /service/requirements.txt
find /service -name '*.sh'|xargs chmod a+x
}
diff --git a/huawei/vnfmadapter/VnfmadapterService/requirements.txt b/huawei/vnfmadapter/VnfmadapterService/requirements.txt
new file mode 100644
index 00000000..8d63bf0d
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/requirements.txt
@@ -0,0 +1,21 @@
+# rest framework
+Django==2.1.10
+djangorestframework==3.10.0
+
+# for call rest api
+httplib2==0.19.1
+
+# for unit test
+coverage==4.2
+mock==3.0.5
+unittest_xml_reporting==1.12.0
+
+# for auto swagger
+drf-yasg==1.17.0
+flex>=6.11.1
+swagger-spec-validator>=2.1.0
+
+# uwsgi for parallel processing
+# uwsgi
+
+PyYAML==5.4.1