Skip to content

Commit

Permalink
chore: version bump + @grpc/grpc-js (#46)
Browse files Browse the repository at this point in the history
* version bump

* downcrade protoc back to 3.11.4

* bump all

* generated go code with bumped versions

* use tagged protoc docker images

Co-authored-by: Moritz Zimmer <moritz.zmmr@gmail.com>
  • Loading branch information
bobaaaaa and moritzzimmer committed Sep 30, 2020
1 parent 24f0d05 commit e7caa19
Show file tree
Hide file tree
Showing 5 changed files with 1,290 additions and 1,413 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GO_DIR = ./go
OUTPUT ?= $(JAVA_DIR)
LANGUAGE ?= java
GRPCPLUGIN ?= /usr/bin/protoc-gen-grpc-$(LANGUAGE)
PROTOC ?= docker run --rm -v $(DIR):$(DIR) -w $(DIR) ghcr.io/stroeer/protoc-dockerized
PROTOC ?= docker run --rm -v $(DIR):$(DIR) -w $(DIR) ghcr.io/stroeer/protoc-dockerized:3.13.0

FLAGS+= --proto_path=$(DIR)
ifeq ($(LANGUAGE),node)
Expand All @@ -27,8 +27,8 @@ ifeq ($(LANGUAGE),node)
FLAGS+= --plugin=protoc-gen-ts=/node_modules/.bin/protoc-gen-ts
FLAGS+= --plugin=protoc-gen-grpc=/node_modules/.bin/grpc_tools_node_protoc_plugin
FLAGS+= --js_out=import_style=commonjs,binary:$(OUTPUT)
FLAGS+= --ts_out=service=grpc-node:$(OUTPUT)
FLAGS+= --grpc_out=$(OUTPUT)
FLAGS+= --ts_out=service=grpc-node,mode=grpc-js:$(OUTPUT)
FLAGS+= --grpc_out=grpc_js:$(OUTPUT)
else ifeq ($(LANGUAGE),go)
ifeq ($(OUTPUT), $(JAVA_DIR))
OUTPUT = $(GO_DIR)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ $ make LANGUAGE=go
Generating go code is currently not part of the release process. Go sources need
to be generated locally and added to pull requests.

## Docker Image for `stroeer/protoc-dockerized`
## docker Image for `stroeer/protoc-dockerized`

### Requirements
### requirements

Login to `ghcr.io` with your Github user name and a Github personal access token having permissions to `read:packages`, `write:packages` and/or `delete:packages`:

```sh
cat ${TOKEN_FILE_LOCATION} | docker login ghcr.io -u ${GH_USERNAME} --password-stdin
```

### Release new version
### release new version

- look at Requirements above
- bump versions in `build_docker.sh`
- run `build_docker.sh`
- run `docker push ghcr.io/stroeer/protoc-dockerized:latest`
- run `docker tag stroeer/protoc-dockerized:$protoc_version ghcr.io/stroeer/protoc-dockerized:$protoc_version`
- run `docker push ghcr.io/stroeer/protoc-dockerized:$protoc_version`
18 changes: 13 additions & 5 deletions build_docker.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
docker build -t ghcr.io/stroeer/protoc-dockerized:latest \
--build-arg NODE_GRPC_TOOLS_VERSION="1.9.0" \
--build-arg NODE_TS_PROTOC_GEN_VERSION="0.12.0" \
--build-arg JAVA_LIB_VERSION="1.29.0" \
--build-arg PROTOC_VERSION="3.11.4" \
# https://github.com/grpc/grpc-node/releases
# https://github.com/improbable-eng/ts-protoc-gen/releases
# https://github.com/grpc/grpc-java/releases
# https://github.com/protocolbuffers/protobuf/releases
# https://github.com/grpc/grpc-go

protoc_version=3.13.0

docker build -t stroeer/protoc-dockerized:$protoc_version \
--build-arg NODE_GRPC_TOOLS_VERSION="1.9.1" \
--build-arg NODE_TS_PROTOC_GEN_VERSION="0.13.0" \
--build-arg JAVA_LIB_VERSION="1.32.1" \
--build-arg PROTOC_VERSION=$protoc_version \
--build-arg GO_GRPC_TOOLS_VERSION="1.32.0" \
.
Loading

0 comments on commit e7caa19

Please sign in to comment.