Support debug building mode

stevenctl · Aug 4, 2022 · 1381ef1 · 1381ef1
1 parent 993bec3
commit 1381ef1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -146,7 +146,6 @@ default: init build test
 .PHONY: init
 # Downloads envoy, based on the SHA defined in the base pilot Dockerfile
 init: $(TARGET_OUT)/istio_is_init
-	echo ISTIO_ENVOY_LINUX_RELEASE_PATH=$(ISTIO_ENVOY_LINUX_RELEASE_PATH) TARGET_OUT_LINUX=$(TARGET_OUT_LINUX)
 	@mkdir -p ${TARGET_OUT}/logs
 	@mkdir -p ${TARGET_OUT}/release
 

diff --git a/tools/docker-builder/main.go b/tools/docker-builder/main.go
@@ -166,6 +166,11 @@ func ReadPlan(a Args) (Args, error) {
 		input := os.Expand(string(by), func(s string) string {
 			data := archToEnvMap(arch)
 			data["SIDECAR"] = "envoy"
+			if _, f := os.LookupEnv("DEBUG_IMAGE"); f {
+				data["RELEASE_MODE"] = "debug"
+			} else {
+				data["RELEASE_MODE"] = "release"
+			}
 			if r, f := data[s]; f {
 				return r
 			}

diff --git a/tools/docker.yaml b/tools/docker.yaml
@@ -31,7 +31,8 @@ images:
   files:
   - tools/packaging/common/envoy_bootstrap.json
   - tools/packaging/common/gcp_envoy_bootstrap.json
-  - ${TARGET_OUT_LINUX}/release/${SIDECAR}
+  - ${TARGET_OUT_LINUX}/${RELEASE_MODE}/${SIDECAR}
+  # WASM has no debug mode, always use release/
   - ${TARGET_OUT_LINUX}/release/stats-filter.wasm
   - ${TARGET_OUT_LINUX}/release/stats-filter.compiled.wasm
   - ${TARGET_OUT_LINUX}/release/metadata-exchange-filter.wasm