Skip to content

Commit

Permalink
Update Debian (and other deps) and remove Java In-process Proxy (#1335)
Browse files Browse the repository at this point in the history
  • Loading branch information
sampajano authored May 14, 2023
1 parent c5c1e29 commit f8fbbe3
Show file tree
Hide file tree
Showing 48 changed files with 25 additions and 2,931 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ Multiple proxies support the gRPC-web protocol.

3. Apache [APISIX](https://apisix.apache.org/) has also added grpc-web support, and more details can be found [here](https://apisix.apache.org/blog/2022/01/25/apisix-grpc-web-integration/).

4. [Nginx](https://www.nginx.com/) has a grpc-web module ([doc](https://nginx.org/en/docs/http/ngx_http_grpc_module.html), [announcement](https://www.nginx.com/blog/nginx-1-13-10-grpc/))), and seems to work with simple configs, according to user [feedback](https://github.com/grpc/grpc-web/discussions/1322).

### Web Frameworks with gRPC-Web support
- [Armeria (JVM)](https://armeria.dev/docs/server-grpc/#grpc-web)
- [Tonic (Rust)](https://docs.rs/tonic-web/latest/tonic_web/)
Expand Down
5 changes: 0 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ services:
image: grpcweb/interop-client
ports:
- "8081:8081"
java-interop-server:
build:
context: ./
dockerfile: ./net/grpc/gateway/docker/java_interop_server/Dockerfile
image: grpcweb/java-interop-server
protoc-plugin:
build:
context: ./
Expand Down
41 changes: 0 additions & 41 deletions net/grpc/gateway/docker/java_interop_server/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion net/grpc/gateway/docker/node_interop_server/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 node:12.22.6-stretch
FROM node:20.0.0-bullseye

WORKDIR /github/grpc-node

Expand Down
6 changes: 3 additions & 3 deletions net/grpc/gateway/docker/prereqs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
######################################
# Stage 1: Fetch binaries
######################################
# node:... Docker image is based on buildpack-deps:stretch
FROM buildpack-deps:stretch AS prepare
# node:... Docker image is based on buildpack-deps:bullseye (11)
FROM buildpack-deps:bullseye AS prepare

ARG BUILDIFIER_VERSION=1.0.0
ARG PROTOBUF_VERSION=3.19.4
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN ./scripts/init_submodules.sh
######################################
# Stage 2: Copy source files and build
######################################
FROM node:12.22.6-stretch AS copy-and-build
FROM node:20.0.0-bullseye AS copy-and-build

ARG MAKEFLAGS=-j8
ARG BAZEL_VERSION=4.1.0
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/examples/echo/commonjs-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"grpc-web": "~1.4.2"
},
"devDependencies": {
"webpack": "~4.43.0",
"webpack-cli": "~3.3.11"
"webpack": "~5.82.1",
"webpack-cli": "~5.1.1"
}
}
4 changes: 2 additions & 2 deletions net/grpc/gateway/examples/echo/ts-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"jquery": "~3.5.1",
"mock-xmlhttprequest": "~2.0.0",
"typescript": "latest",
"webpack": "~4.43.0",
"webpack-cli": "~3.3.11"
"webpack": "~5.82.1",
"webpack-cli": "~5.1.1"
}
}
4 changes: 2 additions & 2 deletions net/grpc/gateway/examples/echo/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ You will need a `package.json` file
"grpc-web": "~1.4.2"
},
"devDependencies": {
"webpack": "~4.43.0",
"webpack-cli": "~3.3.11"
"webpack": "~5.82.1",
"webpack-cli": "~5.1.1"
}
}
```
Expand Down
14 changes: 0 additions & 14 deletions net/grpc/gateway/examples/grpc-web-java/greeter-service/README.md

This file was deleted.

120 changes: 0 additions & 120 deletions net/grpc/gateway/examples/grpc-web-java/greeter-service/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f8fbbe3

Please sign in to comment.