diff --git a/Makefile b/Makefile index 5b4be46..44a4cbf 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,8 @@ K8S_DEPLOY_PARAM_RESOURCE_SUFFIX=$(GIT_BRANCH) K8S_DEPLOY_PARAM_ARC_PREFIX=$(ACR_PREFIX) TMP_FILE_DEPLOY=.tmp.deploy.txt +TMP_DATA_DIR=tmpData +CONFIGFILES_PROJECT_NAME=configfiles #GIT_BRANCH=master-rd @@ -70,7 +72,7 @@ buildquick: gitReset @echo BUILD_FLAGS=$(BUILD_FLAGS) @go build $(BUILD_FLAGS) -o ./pack/service ./ -docker: clean buildquick +docker: clean buildquick configfiles @echo ==build docker image and push == ## 非 x86_64平台,不允许做docker镜像的构建 @if [ "$(X86_64)" = "" ] ; then\ @@ -101,6 +103,26 @@ deployK8s: docker echo !!!!! no docker building in branch $(GIT_BRANCH) !!!!!!; \ fi +configfiles: + @echo ==get configfiles== + @echo $(GIT_BRANCH) + @if [[ $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\ + mkdir -p $(TMP_DATA_DIR); \ + cd $(TMP_DATA_DIR); \ + [ ! -e $(CONFIGFILES_PROJECT_NAME) ] && git clone https://git.pandaminer.com/halley/$(CONFIGFILES_PROJECT_NAME); \ + cd $(CONFIGFILES_PROJECT_NAME); \ + echo currDir:; \ + pwd; \ + git fetch; \ + git checkout $(GIT_BRANCH); \ + git reset --hard origin/$(GIT_BRANCH); \ + cd ../..; \ + echo currDir:; \ + pwd; \ + cp ./$(TMP_DATA_DIR)/$(CONFIGFILES_PROJECT_NAME)/$(CURR_MODEL_NAME)/pack/.service.config.yaml ./pack/.service.config.yaml; \ + else \ + echo !!!!! no configfiles process in branch $(GIT_BRANCH) !!!!!!; \ + fi build: buildquick