From a4fc17247a30cd1ba120a20048913096f4db08a8 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 6 Sep 2019 01:48:33 -0700 Subject: Fix copy-resource issue of artifactbroker -- modification should be made in packages/pom.xml instead of the one in artifactbroker root Change-Id: Ic2f3209b3a2249f7bbba1f4e6f08f6f20d964dcf Issue-ID: MULTICLOUD-806 Signed-off-by: Liang Ding --- artifactbroker/docker/build_image.sh | 45 ------------------------------------ 1 file changed, 45 deletions(-) delete mode 100755 artifactbroker/docker/build_image.sh (limited to 'artifactbroker/docker/build_image.sh') diff --git a/artifactbroker/docker/build_image.sh b/artifactbroker/docker/build_image.sh deleted file mode 100755 index e082e9b..0000000 --- a/artifactbroker/docker/build_image.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# Copyright (c) 2017-2018 VMware, Inc. -# -# 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. - -DIRNAME=`dirname $0` -DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd` -echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" -cd ${DOCKER_BUILD_DIR} - -BUILD_ARGS="--no-cache" -ORG="onap" -VERSION="1.4.0-SNAPSHOT" -STAGING_VERSION="1.4.0-STAGING" -PROJECT="multicloud" -IMAGE="framework-artifactbroker" -DOCKER_REPOSITORY="nexus3.onap.org:10003" -IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" - -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_VERSION} . -} - -function push_image { - docker push ${IMAGE_NAME}:${VERSION} - docker push ${IMAGE_NAME}:${STAGING_VERSION} - docker push ${IMAGE_NAME}:latest -} - -build_image -push_image -- cgit 1.2.3-korg