Browse Source

update: 调整 Dockerfile目录,由 .../pack/ 目录 调整为 .../

主要是因为 halley/api  代码中已经把配置文件目录写死( .../conf 、  .../views 等), 要调整目录( .../pack/conf 、 .../pack/views   等),就需要做大类代码的改动;
为了规避这个大改动,  把Dockerfile 从 .../pack  调整为 .../
zhoushx1018 2 years ago
parent
commit
341e990130
  1. 1
      Makefile

1
Makefile

@ -83,7 +83,6 @@ docker: clean buildquick
@echo CURR_MODEL_NAME=$(CURR_MODEL_NAME); @echo CURR_MODEL_NAME=$(CURR_MODEL_NAME);
@echo GIT_BRANCH=$(GIT_BRANCH); @echo GIT_BRANCH=$(GIT_BRANCH);
@if [[ $(GIT_BRANCH) = $(BRANCH_DEV) || $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\ @if [[ $(GIT_BRANCH) = $(BRANCH_DEV) || $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\
cd pack;\
docker build -t $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) .;\ docker build -t $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) .;\
docker tag $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) $(ACR_PREFIX)/$(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG); \ docker tag $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) $(ACR_PREFIX)/$(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG); \
docker push $(ACR_PREFIX)/$(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG); \ docker push $(ACR_PREFIX)/$(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG); \

Loading…
Cancel
Save