Merge branch 'master' into master

grpc · Jan 21, 2020 · a2405bd · a2405bd
2 parents 478cb23 + 4a5b5b3
commit a2405bd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/net/grpc/gateway/docker/envoy/Dockerfile b/net/grpc/gateway/docker/envoy/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM envoyproxy/envoy:latest
+FROM envoyproxy/envoy:v1.12.2
 
 COPY net/grpc/gateway/examples/echo/envoy.yaml /etc/envoy/envoy.yaml
 

diff --git a/net/grpc/gateway/docker/ts_client/Dockerfile b/net/grpc/gateway/docker/ts_client/Dockerfile
@@ -14,7 +14,7 @@
 
 FROM grpcweb/prereqs
 
-RUN npm install -g tsc typescript
+RUN npm install -g typescript
 
 WORKDIR /github/grpc-web/net/grpc/gateway/examples/echo
 

diff --git a/net/grpc/gateway/examples/helloworld/README.md b/net/grpc/gateway/examples/helloworld/README.md
@@ -216,6 +216,7 @@ And finally a simple `index.html` file.
 <script src="./dist/main.js"></script>
 </head>
 <body>
+  <p>Open up the developer console and see the logs for the output.</p>
 </body>
 </html>
 ```

diff --git a/net/grpc/gateway/examples/helloworld/index.html b/net/grpc/gateway/examples/helloworld/index.html
@@ -6,5 +6,6 @@
 <script src="./dist/main.js"></script>
 </head>
 <body>
+  <p>Open up the developer console and see the logs for the output.</p>
 </body>
 </html>