From da4eac9ee7d18352a57d14f04c629c73df1bbafa Mon Sep 17 00:00:00 2001
From: zhoushx1018 <zhoushx1018@gmail.com>
Date: Tue, 14 Jun 2022 18:29:11 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=20=E8=B0=83=E6=95=B4docker=20build?=
 =?UTF-8?q?=20=E6=89=A7=E8=A1=8C=E7=9B=AE=E5=BD=95=EF=BC=8C=E7=94=B1=20=20?=
 =?UTF-8?q?.../pack/=20=20=20=E7=9B=AE=E5=BD=95=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=BA=20=20.../?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

背景
    执行目录 为 .../pack  ，如果Dockfile 涉及拷贝父目录文件夹（ COPY ../conf  ./conf ），会报错 "Forbidden path outside the build context"
    如果把 ../conf  等配置文件拷贝 的  pack目录， 需要做大量源码改动；

    调整 docker build执行目录，是最优解决方案
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ef14abb..5b4be46 100644
--- a/Makefile
+++ b/Makefile
@@ -83,8 +83,7 @@ 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 build -t $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) -f pack/Dockerfile .;\
 		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); \
 	else \