diff options
| author |   Haibin Huang <haibin.huang@intel.com> | 2019-08-28 19:51:31 +0800 |
|---|---|---|
| committer | Haibin Huang <haibin.huang@intel.com> | 2019-08-29 10:22:48 +0800 |
| commit | f75e4c22cb928d11bd78f15b45b1c42098e588d4 (patch) | |
| tree | 2bb6072e9890fc5874a79058be997f8bc6a51b02 /starlingx/docker | |
| parent | 3f9d312fabb805bb16e89b662d5c70efe91c6b79 (diff) | |
update starlingx plugin to python3
Issue-ID: MULTICLOUD-794
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Change-Id: I41d11465d24ea4d15f37db2146d7a77998f535f0
Diffstat (limited to 'starlingx/docker')
| -rw-r--r-- | starlingx/docker/Dockerfile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile index 8d6e6bc9..bc169f92 100644 --- a/starlingx/docker/Dockerfile +++ b/starlingx/docker/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM python:2-alpine +FROM python:3-alpine ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -32,15 +32,16 @@ ENV AAI_PASSWORD "AAI" EXPOSE 9009 RUN addgroup -S onap && adduser -S -G onap onap - +# COPY ./ /opt/ +COPY ./multicloud-openstack-starlingx-*.zip /opt/multicloud-openstack-starlingx.zip RUN apk update && \ - apk add bash uwsgi curl memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ + apk add pcre pcre-dev uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.4.0" && \ unzip -q -o -B /opt/multicloud-openstack-starlingx.zip -d /opt/ && \ rm -f /opt/multicloud-openstack-starlingx.zip && \ - pip install -r /opt/starlingx/requirements.txt && \ - apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \ + pip3 install -r /opt/starlingx/requirements.txt && \ + pip3 install -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 |