diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2022-03-21 22:40:51 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2022-03-22 14:31:13 +0800 |
| commit | de7df2bb51ecd068d3eae6cf314b20c744e96927 (patch) | |
| tree | b55034272a7d683dba1a95c504c6594d970645d3 /starlingx/docker | |
| parent | 3bd3e44e2c9533b96f6f6664f9d6ed2150515955 (diff) | |
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
Diffstat (limited to 'starlingx/docker')
| -rw-r--r-- | starlingx/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | starlingx/docker/Dockerfile4composer | 57 |
2 files changed, 58 insertions, 1 deletions
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile index 79b351d3..d0cb914d 100644 --- a/starlingx/docker/Dockerfile +++ b/starlingx/docker/Dockerfile @@ -39,7 +39,7 @@ USER root # COPY ./ /opt/ COPY ./multicloud-openstack-starlingx-*.zip /opt/multicloud-openstack-starlingx.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 /opt/multicloud-openstack-starlingx.zip -d /opt/ && \ rm -f /opt/multicloud-openstack-starlingx.zip && \ diff --git a/starlingx/docker/Dockerfile4composer b/starlingx/docker/Dockerfile4composer new file mode 100644 index 00000000..e99dce8d --- /dev/null +++ b/starlingx/docker/Dockerfile4composer @@ -0,0 +1,57 @@ +# Copyright (c) 2019 Intel 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. + +# 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_SERVICE_URL "" +ENV AAI_SCHEMA_VERSION "v13" +ENV AAI_USERNAME "AAI" +ENV AAI_PASSWORD "AAI" + +EXPOSE 9009 + +# RUN addgroup -S onap && adduser -S -G onap onap +USER root + +COPY ./starlingx /opt/starlingx/ +COPY ./share /opt/starlingx/lib/share +# COPY ./ /opt/ +# COPY ./multicloud-openstack-starlingx-*.zip /opt/multicloud-openstack-starlingx.zip +RUN apk update && \ + apk add pcre pcre-dev uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \ + cd /opt/ && \ + pip3 install --no-cache-dir -r /opt/starlingx/requirements.txt && \ + pip3 install --no-cache-dir -r /opt/starlingx/uwsgi-requirements.txt && \ + apk del wget unzip gcc make libc-dev libffi-dev openssl-dev pcre-dev && \ + mkdir -p /var/log/onap/multicloud/openstack/starlingx && \ + chown onap:onap /var/log/onap -R && \ + chown onap:onap /opt/starlingx -R + +RUN mkdir -p /var/log/onap/multicloud/openstack/starlingx/ + +USER onap +WORKDIR /opt/starlingx +CMD /bin/sh -c "/opt/starlingx/run.sh" |