X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=9c29f5022558561f149060c5c47cf64988e4c3ce;hb=059775ccd9e7c5482747729890800f7a7d507a94;hp=51f53bbb0b7acd96cd1da04a59551cee37a7ca43;hpb=27ba444c3b55176ca4d9e6ed7a9a2ff99a4e9e5c;p=ric-plt%2Fappmgr.git

diff --git a/Makefile b/Makefile
index 51f53bb..9c29f50 100644
--- a/Makefile
+++ b/Makefile
@@ -24,19 +24,21 @@ test: go-test
 
 #------------------------------------------------------------------------------
 #
-# Build and test targets
-#
 #------------------------------------------------------------------------------
 ROOT_DIR:=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-BUILD_DIR:=$(abspath $(ROOT_DIR)/build)
+CACHE_DIR?=$(abspath $(ROOT_DIR)/cache)
 
+#------------------------------------------------------------------------------
+#
+# Build and test targets
+#
+#------------------------------------------------------------------------------
 
 XAPP_NAME:=appmgr
 XAPP_ROOT:=cmd
 XAPP_TESTENV:="RMR_SEED_RT=config/uta_rtg.rt CFG_FILE=$(ROOT_DIR)helm_chart/uemgr/descriptors/config-file.json"
 include build/make.go.mk 
 
-
 #------------------------------------------------------------------------------
 #
 # DOCKER TARGETS
@@ -48,6 +50,9 @@ DCKR_B_OPTS:=${DCKR_B_OPTS} --build-arg HELMVERSION=${HELMVERSION}
 
 PACKAGEURL:="gerrit.oran-osc.org/r/ric-plt/appmgr"
 
+DCKR_NAME:=appmgr-xapp-base
+include build/make.docker.mk
+
 DCKR_NAME:=appmgr-test_unit
 include build/make.docker.mk
 
@@ -61,5 +66,5 @@ DCKR_NAME:=appmgr
 include build/make.docker.mk
 
 
-docker-test: docker-run_appmgr-test_fmt docker-run_appmgr-test_sanity docker-run-redished_appmgr-test_unit
+docker-test: docker-run-stop_appmgr-test_fmt docker-run-stop_appmgr-test_sanity docker-run-stop_appmgr-test_unit