diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2019-08-16 08:08:35 +0000 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2019-08-16 08:08:35 +0000 |
| commit | f4801b212ee73f9d540489f4f6d684330ffb66eb (patch) | |
| tree | 464d4c5791e5b24f2e81e85e13f1a7b50d6ed81a | |
| parent | 7c194de2d67a1c71b741345a74ed9a493936fdb0 (diff) | |
Fix docker build issue
Build docker image with local artifact
Change-Id: I12eaafa7b93effe24479dd998aa7218d60920417
Issue-ID: MULTICLOUD-767
Signed-off-by: Bin Yang <bin.yang@windriver.com>
| -rw-r--r-- | multivimbroker/docker/Dockerfile | 9 | ||||
| -rw-r--r-- | multivimbroker/pom.xml | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 49a0401..1dfc075 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2-alpine +FROM python:3-alpine ENV MSB_ADDR "127.0.0.1" ENV MSB_PORT "80" @@ -12,15 +12,14 @@ EXPOSE 9001 RUN addgroup -S onap && adduser -S -G onap onap -# COPY ./ /opt/multivimbroker/ +COPY ./multicloud-framework-broker-1.4.0-SNAPSHOT.zip /opt/multicloud-framework.zip 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=staging&g=org.onap.multicloud.framework&a=multicloud-framework-broker&e=zip&v=1.4.0" && \ 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 && \ + pip3 install -r /opt/multivimbroker/requirements.txt && \ + pip3 install -r /opt/multivimbroker/uwsgi-requirements.txt && \ 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 && \ diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index fd7de1c..0aa08d8 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -136,6 +136,13 @@ <directory>${project.basedir}/docker</directory> <filtering>true</filtering> </resource> + <resource> + <directory>${project.basedir}/target</directory> + <filtering>true</filtering> + <includes> + <include>*.zip</include> + </includes> + </resource> </resources> </configuration> </execution> |