From 341e9901305c6f5e678296b69ee31ffe5f653f60 Mon Sep 17 00:00:00 2001 From: zhoushx1018 Date: Tue, 14 Jun 2022 18:29:11 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E8=B0=83=E6=95=B4=20Dockerfile?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=EF=BC=8C=E7=94=B1=20=20.../pack/=20=20=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=20=E8=B0=83=E6=95=B4=E4=B8=BA=20=20.../?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主要是因为 halley/api 代码中已经把配置文件目录写死（ .../conf 、 .../views 等）， 要调整目录（ .../pack/conf 、 .../pack/views 等），就需要做大类代码的改动； 为了规避这个大改动， 把Dockerfile 从 .../pack 调整为 .../ --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index ef14abb..7ce136d 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,6 @@ docker: clean buildquick @echo CURR_MODEL_NAME=$(CURR_MODEL_NAME); @echo GIT_BRANCH=$(GIT_BRANCH); @if [[ $(GIT_BRANCH) = $(BRANCH_DEV) || $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\ - cd pack;\ 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 push $(ACR_PREFIX)/$(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG); \