summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-03-06 08:41:18 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-06 08:41:18 +0000
commit14456ed1c40e8f7358854d93822537d373c7996c (patch)
tree465b8cb61301216ba336785fa812ab17772afe0d
parent2c256a9e799701b1e012368a24e757d964badd2b (diff)
parent41fc14132de75705262b1c9e38a697a7a18d8935 (diff)
Merge "Optimize docker image footprint size"
-rw-r--r--fcaps/docker/Dockerfile6
-rw-r--r--fcaps/requirements.txt6
-rw-r--r--fcaps/test-requirements.txt5
3 files changed, 12 insertions, 5 deletions
diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index 8a3c6b2f..6484905b 100644
--- a/fcaps/docker/Dockerfile
+++ b/fcaps/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2
+FROM python:2-slim
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -20,7 +20,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
# COPY ./ /opt/fcaps/
RUN apt-get update && \
- apt-get install -y memcached && \
+ apt-get install -y memcached wget unzip gcc && \
apt-get install -y unzip && \
cd /opt/ && \
wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.0-SNAPSHOT" && \
@@ -28,6 +28,8 @@ RUN apt-get update && \
chmod +x /opt/fcaps/*.sh && \
rm -f multicloud-openstack-fcaps.zip && \
pip install -r /opt/fcaps/requirements.txt && \
+ apt-get --purge remove -y wget unzip gcc && \
+ apt-get -y autoremove && \
chown onap:onap /opt/fcaps -R
USER onap
diff --git a/fcaps/requirements.txt b/fcaps/requirements.txt
index 15b2190e..6a81e502 100644
--- a/fcaps/requirements.txt
+++ b/fcaps/requirements.txt
@@ -15,9 +15,9 @@ python-memcached
uwsgi
# for unit test
-coverage==4.2
-mock==2.0.0
-unittest_xml_reporting==1.12.0
+# coverage==4.2
+# mock==2.0.0
+# unittest_xml_reporting==1.12.0
# for onap logging
onappylog>=1.0.8
diff --git a/fcaps/test-requirements.txt b/fcaps/test-requirements.txt
index 97044b5c..7cfc85fb 100644
--- a/fcaps/test-requirements.txt
+++ b/fcaps/test-requirements.txt
@@ -1 +1,6 @@
+# Add for unit test
+coverage==4.2
+mock==2.0.0
+unittest_xml_reporting==1.12.0
pylint # GPLv2
+