diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-04-22 08:45:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-22 08:45:35 +0000 |
| commit | 0a3ad26565a1694b30ef5de32e9d13779fa62749 (patch) | |
| tree | 6f297f5eee78ceab2fe3dbfe8b5a05e58cb220f7 | |
| parent | a0db0636571ff8bc39d16ac76fa9fde98f90173c (diff) | |
| parent | eab617a9bd4f737d75b26edd0feb1785fd554e13 (diff) | |
Merge "Use Alpine for starlingx"1.3.0
| -rw-r--r-- | starlingx/docker/Dockerfile | 11 | ||||
| -rwxr-xr-x | starlingx/run.sh | 2 | ||||
| -rwxr-xr-x | starlingx/stop.sh | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile index 96ae5d54..36636e5b 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-slim +FROM python:2-alpine ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -31,17 +31,16 @@ ENV AAI_PASSWORD "AAI" EXPOSE 9009 -RUN groupadd -r onap && useradd -r -g onap onap +RUN addgroup -S onap && adduser -S -G onap onap -RUN apt-get update && \ - apt-get install -y memcached wget unzip gcc libssl-dev && \ +RUN apk update && \ + apk add bash uwsgi curl 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=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.3.0-SNAPSHOT" && \ 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 && \ - apt-get --purge remove -y wget unzip gcc && \ - apt-get -y autoremove && \ + apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \ mkdir -p /var/log/onap/multicloud/openstack/starlingx && \ chown onap:onap /var/log/onap -R && \ chown onap:onap /opt/starlingx -R diff --git a/starlingx/run.sh b/starlingx/run.sh index 7b69d169..bea29775 100755 --- a/starlingx/run.sh +++ b/starlingx/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (c) 2019 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/starlingx/stop.sh b/starlingx/stop.sh index 0b734f38..3f7fd2a1 100755 --- a/starlingx/stop.sh +++ b/starlingx/stop.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (c) 2019 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); |