From 56fd16d9f72b1b7f3f4363eeb7edb24a259a4160 Mon Sep 17 00:00:00 2001 From: Changjun Wang <310397125@qq.com> Date: Tue, 5 Mar 2019 10:22:47 +0000 Subject: Add Lenovo ThinkCLoud Driver add a new branch lenovo modify pom.xml under the root Change-Id: I5edd57bf3e9cc1e32c5a94b9494daf645b220eaa Issue-ID: MULTICLOUD-506 Signed-off-by: Changjun Wang <310397125@qq.com> --- lenovo/docker/Dockerfile | 49 ++++++++++++++++++++++++++++++++++++++++++++ lenovo/docker/build_image.sh | 45 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 lenovo/docker/Dockerfile create mode 100755 lenovo/docker/build_image.sh (limited to 'lenovo/docker') diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile new file mode 100644 index 00000000..5660e8e0 --- /dev/null +++ b/lenovo/docker/Dockerfile @@ -0,0 +1,49 @@ +# Copyright (c) 2018 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM python:2.7 + +ARG HTTP_PROXY=${HTTP_PROXY} +ARG HTTPS_PROXY=${HTTPS_PROXY} + +ENV http_proxy $HTTP_PROXY +ENV https_proxy $HTTPS_PROXY + +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_SERVICE_URL "" +ENV AAI_SCHEMA_VERSION "v13" +ENV AAI_USERNAME "AAI" +ENV AAI_PASSWORD "AAI" + +EXPOSE 9010 + +RUN groupadd -r onap && useradd -r -g onap onap + +RUN apt-get update && apt-get install -y memcached unzip gcc && \ + cd /opt/ && \ + wget -O multicloud-openstack-thinkcloud.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-thinkcloud&e=zip&v=1.3.0-SNAPSHOT" && \ + unzip -q -o -B multicloud-openstack-thinkcloud.zip && \ + chmod +x /opt/thinkcloud/*.sh &&\ + rm -f multicloud-openstack-thinkcloud.zip &&\ + pip install -r /opt/thinkcloud/requirements.txt &&\ + apt-get remove -y unzip gcc && \ + chown onap:onap /opt/thinkcloud -R + +USER onap + +WORKDIR /opt/thinkcloud +CMD /bin/sh -c /opt/thinkcloud/run.sh diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh new file mode 100755 index 00000000..eca84326 --- /dev/null +++ b/lenovo/docker/build_image.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# Copyright (c) 2018 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +DIRNAME=`dirname $0` +DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd` +echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" +cd ${DOCKER_BUILD_DIR} + +BUILD_ARGS="--no-cache" +VERSION="1.3.0-SNAPSHOT" +STAGING="1.3.0-STAGING" +OS_VERSION="thinkcloud" +IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" + +if [ $HTTP_PROXY ]; then + BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" +fi +if [ $HTTPS_PROXY ]; then + BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" +fi + +function build_image { + docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} . +} + +function push_image { + docker push ${IMAGE_NAME}:${VERSION} + docker push ${IMAGE_NAME}:latest + docker push ${IMAGE_NAME}:${STAGING} +} + +build_image +push_image -- cgit 1.2.3-korg