From 04a2b6dc2cfa4719d7dc84df52a4d8dc264d9c10 Mon Sep 17 00:00:00 2001
From: Diem Vu <25132401+diemtvu@users.noreply.github.com>
Date: Mon, 12 Mar 2018 18:16:41 -0700
Subject: [PATCH] Add chmod 755 for envoy in proxy docker rule. (#4222)

* Add chmod 755 for envoy in proxy docker rule.

* Typos
---
 pilot/docker/Dockerfile.proxy       | 3 +++
 pilot/docker/Dockerfile.proxy_debug | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pilot/docker/Dockerfile.proxy b/pilot/docker/Dockerfile.proxy
index 618ad6195173..5865edcbd44e 100644
--- a/pilot/docker/Dockerfile.proxy
+++ b/pilot/docker/Dockerfile.proxy
@@ -11,5 +11,8 @@ COPY envoy_mixer.json      /etc/istio/proxy/envoy_mixer.json
 COPY envoy_mixer_auth.json /etc/istio/proxy/envoy_mixer_auth.json
 COPY envoy_bootstrap_tmpl.json /var/lib/istio/envoy/envoy_bootstrap_tmpl.json
 
+# Allow non-root user to run envoy.
+RUN chmod 755 /usr/local/bin/envoy
+
 # The pilot-agent will bootstrap Envoy.
 ENTRYPOINT ["/usr/local/bin/pilot-agent"]
diff --git a/pilot/docker/Dockerfile.proxy_debug b/pilot/docker/Dockerfile.proxy_debug
index b3b8090ac49a..15e9796f0123 100644
--- a/pilot/docker/Dockerfile.proxy_debug
+++ b/pilot/docker/Dockerfile.proxy_debug
@@ -16,5 +16,8 @@ RUN useradd -m --uid 1337 istio-proxy && \
     echo "istio-proxy ALL=NOPASSWD: ALL" >> /etc/sudoers && \
     chown -R istio-proxy /var/lib/istio
 
+# Allow non-root user to run envoy.
+RUN chmod 755 /usr/local/bin/envoy
+
 # The pilot-agent will bootstrap Envoy.
 ENTRYPOINT ["/usr/local/bin/pilot-agent"]