Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Envoy to 1.15.0 #885

Merged
merged 1 commit into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/grpc/gateway/docker/envoy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM envoyproxy/envoy:v1.14.1
FROM envoyproxy/envoy:v1.15.0

COPY net/grpc/gateway/examples/echo/envoy.yaml /etc/envoy/envoy.yaml

Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/examples/helloworld/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,15 @@ run the 3 processes all in the background.

```sh
$ docker run -d -v "$(pwd)"/envoy.yaml:/etc/envoy/envoy.yaml:ro \
--network=host envoyproxy/envoy:v1.14.1
--network=host envoyproxy/envoy:v1.15.0
```

> NOTE: As per [this issue](https://github.com/grpc/grpc-web/issues/436):
> if you are running Docker on Mac/Windows, remove the `--network=host` option:
>
> ```sh
> $ docker run -d -v "$(pwd)"/envoy.yaml:/etc/envoy/envoy.yaml:ro \
> -p 8080:8080 -p 9901:9901 envoyproxy/envoy:v1.14.1
> -p 8080:8080 -p 9901:9901 envoyproxy/envoy:v1.15.0
> ```

3. Run the simple Web Server. This hosts the static file `index.html` and
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_interop_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ docker-compose build common prereqs node-interop-server interop-client java-inte
# Run interop tests
pid1=$(docker run -d \
-v "$(pwd)"/test/interop/envoy.yaml:/etc/envoy/envoy.yaml:ro \
--network=host envoyproxy/envoy:v1.14.1)
--network=host envoyproxy/envoy:v1.15.0)
pid2=$(docker run -d --network=host grpcweb/node-interop-server)

run_tests
Expand Down
2 changes: 1 addition & 1 deletion test/interop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tests.

```sh
$ docker run -d -v $(pwd)/test/interop/envoy.yaml:/etc/envoy/envoy.yaml:ro \
--network=host envoyproxy/envoy:v1.14.1
--network=host envoyproxy/envoy:v1.15.0
```


Expand Down