memcached container as sidecar1.5.7

To fix the dependency on memcached which depends on the GPLv3 licensed gdbm indirectly,
Use sidecar to integrate memcached from dockerhub

Add docker-composer scripts to support local test

Issue-ID: MULTICLOUD-1457

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I55a156c0af158535dccfa87e7b9603e47be4d9c1

3 files changed, 44 insertions, 32 deletions

diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index 3de775a7..f25e28ac 100644
--- a/fcaps/docker/Dockerfile
+++ b/fcaps/docker/Dockerfile
@@ -25,7 +25,7 @@ USER root
 COPY ./multicloud-openstack-fcaps-*.zip /opt/multicloud-openstack-fcaps.zip
 
 RUN apk update && \
-    apk add pcre pcre-dev uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
+    apk add pcre pcre-dev uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
     unzip -q -o -B multicloud-openstack-fcaps.zip && \
     chmod +x /opt/fcaps/*.sh && \
diff --git a/fcaps/docker/Dockerfile4composer b/fcaps/docker/Dockerfile4composer
new file mode 100644
index 00000000..0c5c1657
--- /dev/null
+++ b/fcaps/docker/Dockerfile4composer
@@ -0,0 +1,43 @@
+# FROM python:3.8-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:9.1.0
+
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
+
+ENV MSB_PROTO "http"
+ENV MSB_ADDR "127.0.0.1"
+ENV MSB_PORT "80"
+ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"
+ENV AAI_PORT "8443"
+ENV AAI_SCHEMA_VERSION "v13"
+ENV AAI_USERNAME "AAI"
+ENV AAI_PASSWORD "AAI"
+
+EXPOSE 9011
+
+# RUN addgroup -S onap && adduser -S -G onap onap
+USER root
+
+COPY ./fcaps /opt/fcaps/
+COPY ./share /opt/fcaps/lib/share
+# COPY ./multicloud-openstack-fcaps-*.zip /opt/multicloud-openstack-fcaps.zip
+
+RUN apk update && \
+    apk add pcre pcre-dev uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \
+    cd /opt/ && \
+    chmod +x /opt/fcaps/*.sh && \
+    pip3 install --no-cache-dir -r /opt/fcaps/requirements.txt && \
+    pip3 install --no-cache-dir -r /opt/fcaps/uwsgi-requirements.txt && \
+    apk del wget unzip gcc make libc-dev libffi-dev openssl-dev pcre-dev && \
+    mkdir -p /var/log/onap/multicloud/fcaps && \
+    chown onap:onap /var/log/onap -R && \
+    chown onap:onap /opt/fcaps -R
+
+
+USER onap
+
+WORKDIR /opt/fcaps
+CMD /bin/sh -c /opt/fcaps/run.sh
diff --git a/fcaps/docker/docker-compose.yml b/fcaps/docker/docker-compose.yml
deleted file mode 100644
index 5a9c2569..00000000
--- a/fcaps/docker/docker-compose.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019 CMCC Corporation.
-# 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.
-
-# Only used for local test
-#First need to add broker('amqp://admin:mypass@rabbit:5672') to Celery
-
-version: '2'
-services:
-    rabbit:
-        hostname: rabbit
-        image: rabbitmq:alpine
-        environment:
-            - RABBITMQ_DEFAULT_USER=admin
-            - RABBITMQ_DEFAULT_PASS=mypass
-        ports:
-            - "15672:15672"
-
-    worker:
-        build:
-            context: .
-            dockerfile: Dockerfile
-        volumes:
-            - .:/fcaps