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 /windriver/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 'windriver/docker')
| -rw-r--r-- | windriver/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | windriver/docker/Dockerfile4composer | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile index 0f26f13b..4815c3b0 100644 --- a/windriver/docker/Dockerfile +++ b/windriver/docker/Dockerfile @@ -24,7 +24,7 @@ USER root # COPY ./ /opt/windriver/ COPY ./multicloud-openstack-windriver-*.zip /opt/multicloud-openstack-windriver.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-windriver.zip && \ chmod +x /opt/windriver/*.sh && \ diff --git a/windriver/docker/Dockerfile4composer b/windriver/docker/Dockerfile4composer new file mode 100644 index 00000000..5d0dfc35 --- /dev/null +++ b/windriver/docker/Dockerfile4composer @@ -0,0 +1,42 @@ +# 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 9005 + +# RUN addgroup -S onap && adduser -S -G onap onap +USER root + +COPY ./windriver /opt/windriver/ +COPY ./share /opt/windriver/lib/share +# COPY ./ /opt/windriver/ +# COPY ./multicloud-openstack-windriver-*.zip /opt/multicloud-openstack-windriver.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/windriver/*.sh && \ + pip3 install --no-cache-dir -r /opt/windriver/requirements.txt && \ + pip3 install --no-cache-dir -r /opt/windriver/uwsgi-requirements.txt && \ + apk del wget unzip gcc make libc-dev libffi-dev openssl-dev pcre-dev && \ + mkdir -p /var/log/onap/multicloud/openstack/windriver && \ + chown onap:onap /var/log/onap -R && \ + chown onap:onap /opt/windriver -R + +USER onap + +WORKDIR /opt/windriver +CMD /bin/sh -c /opt/windriver/run.sh |