X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=mecm%2Fmepm%2Fapplcm%2Fresources%2Fdeployment%2Fbuild_push_image.sh;fp=mecm%2Fmepm%2Fapplcm%2Fbroker%2Fdocker-build.sh;h=24ffcb354bcf28455fa10c3a2c479516732f110e;hb=2bb9c251cb17db7849a0a364fbe557175b336402;hp=6f6bf8b5f4919fc7ae982f472b2e11a79ec8208d;hpb=c804c75d35e597fe5dce26398d1490034a67c768;p=ealt-edge.git

diff --git a/mecm/mepm/applcm/broker/docker-build.sh b/mecm/mepm/applcm/resources/deployment/build_push_image.sh
old mode 100755
new mode 100644
similarity index 68%
rename from mecm/mepm/applcm/broker/docker-build.sh
rename to mecm/mepm/applcm/resources/deployment/build_push_image.sh
index 6f6bf8b..24ffcb3
--- a/mecm/mepm/applcm/broker/docker-build.sh
+++ b/mecm/mepm/applcm/resources/deployment/build_push_image.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2020 Huawei Technologies Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,5 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-MEP_VERSION=latest
-docker build --no-cache -t ealtedge/applcm-broker:${MEP_VERSION} -f build/Dockerfile .
+CURRENT_DIR=`pwd`
+
+echo "DOCKER_BUILD_DIR=${CURRENT_DIR}"
+echo "Build and Push APP LCM"
+
+# Build and push broker
+cd ${CURRENT_DIR}
+cd ../../broker/
+. build_push_image.sh
+
+# Build and push k8s helm plugin
+cd ${CURRENT_DIR}
+cd ../../k8shelm/
+. build_push_image.sh
+