From 2faa774836fc4e2bc7a85091a8c832c2bc5415d2 Mon Sep 17 00:00:00 2001
From: Xiaohua Zhang <xiaohua.zhang@windriver.com>
Date: Fri, 12 Apr 2019 08:47:03 +0000
Subject: Rebase to alpine

Change-Id: Icd0a0026dd8562f2eb4679f3d595932a2bb56161
Issue-ID: MULTICLOUD-505
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
---
 multivimbroker/docker/Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'multivimbroker/docker')

diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile
index aaac4ea..e8dbf44 100644
--- a/multivimbroker/docker/Dockerfile
+++ b/multivimbroker/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2-slim
+FROM python:2-alpine
 
 ENV MSB_ADDR "127.0.0.1"
 ENV MSB_PORT "80"
@@ -10,19 +10,18 @@ ENV AAI_PASSWORD "AAI"
 
 EXPOSE 9001
 
-RUN groupadd -r onap && useradd -r -g onap onap
+RUN addgroup -S onap && adduser -S -G onap onap
 
 # COPY ./ /opt/multivimbroker/
-RUN apt-get update && \
-    apt-get install -y wget unzip gcc libssl-dev && \
+RUN apk update && \
+    apk add uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
     wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.3.0-SNAPSHOT" && \
     unzip -q -o -B multicloud-framework.zip && \
     rm -f multicloud-framework.zip && \
     pip install -r /opt/multivimbroker/requirements.txt && \
     pip install -r /opt/multivimbroker/uwsgi-requirements.txt && \
-    apt-get --purge remove -y wget unzip gcc libssl-dev && \
-    apt-get -y autoremove && \
+    apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     mkdir -p /var/log/onap/multicloud/multivimbroker && \
     chown onap:onap /var/log/onap -R && \
     chown onap:onap /opt/multivimbroker -R
-- 
cgit 1.2.3-korg

ion value='montreal'>montreal</option>
<option value='release-1.0.0'>release-1.0.0</option>
<option value='release-1.1.0'>release-1.1.0</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>SDC Parent Project Catalog FE and BE</td><td class='sub right'>Grokmirror user</td></tr></table>
<table class='tabs'><tr><td>
<a href='/sdc/about/?h=kafka-config'>about</a><a href='/sdc/?h=kafka-config'>summary</a><a href='/sdc/refs/?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>refs</a><a href='/sdc/log/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config'>log</a><a class='active' href='/sdc/tree/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>tree</a><a href='/sdc/commit/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>commit</a><a href='/sdc/diff/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>diff</a><a href='/sdc/stats/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config'>stats</a></td><td class='form'><form class='right' method='get' action='/sdc/log/catalog-ui/src/app/models/instance-fe-details.ts'>
<input type='hidden' name='h' value='kafka-config'/><input type='hidden' name='id' value='53df976426f8845adf58e8ff9355764343a38549'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/sdc/tree/?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>root</a>/<a href='/sdc/tree/catalog-ui?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>catalog-ui</a>/<a href='/sdc/tree/catalog-ui/src?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>src</a>/<a href='/sdc/tree/catalog-ui/src/app?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>app</a>/<a href='/sdc/tree/catalog-ui/src/app/models?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>models</a>/<a href='/sdc/tree/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>instance-fe-details.ts</a></div><div class='content'>blob: b0a6baccc4daadf5e843ed967b8e60ef94e7d805 (<a href='/sdc/plain/catalog-ui/src/app/models/instance-fe-details.ts?h=kafka-config&amp;id=53df976426f8845adf58e8ff9355764343a38549'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
</pre></td>
<td class='lines'><pre><code>