From 1b8e04764cbbbfd1f9ad51d952e2902cee6ae85c Mon Sep 17 00:00:00 2001
From: Yangmin Zhu <ymzhu@google.com>
Date: Fri, 19 Jun 2020 12:43:25 -0700
Subject: [PATCH 1/4] update Envoy SHA

---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index ea1755a5426..f50b69ce999 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -37,12 +37,12 @@ bind(
 # 1. Determine SHA256 `wget https://github.com/istio/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
-# commit date: 06/08/2020
+# commit date: 06/18/2020
 # Used by scripts/generate-wasm.sh
 
-ENVOY_SHA = "71de2b016f078b5edaa7526970628ea645cd638c"
+ENVOY_SHA = "d665726028b781d8f8c7c65261bc77476ca51d69"
 
-ENVOY_SHA256 = "39c0f444193ad15f6c54d70a83dfd1336b44f59d4c923121d280b187211faed9"
+ENVOY_SHA256 = "44730ec63eb8d3892d35d7fc24292f0701bddf2df54465b878e2a61fad0cb7f8"
 
 ENVOY_ORG = "istio"
 

From 69f392721285b163332d6dc6e700dac7597fa73e Mon Sep 17 00:00:00 2001
From: Yangmin Zhu <ymzhu@google.com>
Date: Fri, 19 Jun 2020 14:12:28 -0700
Subject: [PATCH 2/4] change org to istio-private

---
 WORKSPACE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WORKSPACE b/WORKSPACE
index f50b69ce999..0d38187b267 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -44,7 +44,7 @@ ENVOY_SHA = "d665726028b781d8f8c7c65261bc77476ca51d69"
 
 ENVOY_SHA256 = "44730ec63eb8d3892d35d7fc24292f0701bddf2df54465b878e2a61fad0cb7f8"
 
-ENVOY_ORG = "istio"
+ENVOY_ORG = "istio-private"
 
 ENVOY_REPO = "envoy"
 

From 80ad06b26b3f97606143871e16268eb036ca7dcd Mon Sep 17 00:00:00 2001
From: Pengyuan Bian <bianpengyuan@google.com>
Date: Mon, 22 Jun 2020 09:37:42 -0700
Subject: [PATCH 3/4] do not fail wasm build sdk push (#27)

---
 scripts/generate-wasm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-wasm.sh b/scripts/generate-wasm.sh
index e8364e532c8..a3961bcef08 100755
--- a/scripts/generate-wasm.sh
+++ b/scripts/generate-wasm.sh
@@ -73,7 +73,7 @@ if [[ "$(docker images -q ${WASM_SDK_IMAGE}:${WASM_SDK_TAG} 2> /dev/null)" == ""
   # Rebuild and push
   cd api/wasm/cpp && docker build -t ${WASM_SDK_IMAGE}:${WASM_SDK_TAG} -f Dockerfile-sdk .
   if [[ ${PUSH_DOCKER_IMAGE} == 1 ]]; then
-    docker push ${WASM_SDK_IMAGE}:${WASM_SDK_TAG} || "fail to push to ${WASM_SDK_IMAGE} hub"
+    docker push ${WASM_SDK_IMAGE}:${WASM_SDK_TAG} || echo "fail to push to ${WASM_SDK_IMAGE} hub"
   fi
 fi
 

From 26fdb2001706fb0cabc61cc8e80036d11eb2fc2b Mon Sep 17 00:00:00 2001
From: Jacob Delgado <jacob.delgado@volunteers.acasi.info>
Date: Tue, 30 Jun 2020 22:51:47 -0600
Subject: [PATCH 4/4] Merge 1.6.4-patch; update envoy sha

---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 713fb7a4df0..da416302301 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -37,12 +37,12 @@ bind(
 # 1. Determine SHA256 `wget https://github.com/istio/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
-# commit date: 06/22/2020
+# commit date: 06/30/2020
 # Used by scripts/generate-wasm.sh
 
-ENVOY_SHA = "afc94679539e1d690a628ed0f0d3b5f8b631ef2a"
+ENVOY_SHA = "51009f1ab4df5ffdbec13c74b8115f477828b028"
 
-ENVOY_SHA256 = "e6774ac66de3a546b3a77b297a54fe8d9b987ee537a8d4ca3dfd69fc7ebcd1ad"
+ENVOY_SHA256 = "7982582acd5189ec2eaaf0a4d3e53a2e69a90851b27429224376bef0db599f20"
 
 ENVOY_ORG = "istio"