From 78dc1a3aee7dec9c657e99eef91e7bc00b77dfe5 Mon Sep 17 00:00:00 2001 From: Johan Brandhorst Date: Wed, 2 Oct 2019 09:21:18 +0100 Subject: [PATCH] Bump generators Dockerfile to 1.13.1 --- .circleci/Dockerfile | 13 ++++++------ .circleci/README.md | 2 +- .circleci/config.yml | 12 +++++------ CONTRIBUTING.md | 2 +- Makefile | 3 +-- .../proto/examplepb/non_standard_names.pb.go | 20 +++++++++---------- go.mod | 2 ++ 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index 1343053c0e6..5e555123263 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -1,18 +1,18 @@ -FROM golang:1.12 +FROM golang:1.13.1 ## Warm apt cache RUN apt-get update # Install swagger-codegen ENV SWAGGER_CODEGEN_VERSION=2.2.2 -RUN apt-get install -y openjdk-8-jre wget && \ +RUN apt-get install -y openjdk-11-jre wget && \ wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${SWAGGER_CODEGEN_VERSION}/swagger-codegen-cli-${SWAGGER_CODEGEN_VERSION}.jar \ -O /usr/local/bin/swagger-codegen-cli.jar && \ apt-get remove -y wget ENV SWAGGER_CODEGEN="java -jar /usr/local/bin/swagger-codegen-cli.jar" # Install protoc -ENV PROTOC_VERSION=3.7.0 +ENV PROTOC_VERSION=3.9.2 RUN apt-get install -y wget unzip && \ wget https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip \ -O /protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ @@ -20,10 +20,11 @@ RUN apt-get install -y wget unzip && \ rm -f /protoc-${PROTOC_VERSION}-linux-x86_64.zip && \ apt-get remove -y unzip wget -# Install node -ENV NODE_VERSION=v10.15.2 +# Install node, used by NVM +ENV NODE_VERSION=v10.16.3 +ENV NVM_VERSION=v0.35.0 RUN apt-get install -y wget bzip2 && \ - wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash && \ + wget -qO- https://raw.githubusercontent.com/creationix/nvm/${NVM_VERSION}/install.sh | bash && \ apt-get remove -y wget # Clean up diff --git a/.circleci/README.md b/.circleci/README.md index 4aa13589bed..aff8c5cf78c 100644 --- a/.circleci/README.md +++ b/.circleci/README.md @@ -7,7 +7,7 @@ Contained within is the CI test setup for the Gateway. It runs on Circle CI. Great, it should be as simple as thus (run from the root of the directory): ```bash -$ docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.12 \ +$ docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.13 \ /bin/bash -c 'cd /go/src/github.com/grpc-ecosystem/grpc-gateway && \ make realclean && \ make examples SWAGGER_CODEGEN="${SWAGGER_CODEGEN}"' diff --git a/.circleci/config.yml b/.circleci/config.yml index f4332817307..5d2cddb6c26 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,14 +2,14 @@ version: 2 jobs: build: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.12 + - image: jfbrandhorst/grpc-gateway-build-env:1.13 working_directory: /src/grpc-gateway steps: - checkout - run: go build ./... test: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.12 + - image: jfbrandhorst/grpc-gateway-build-env:1.13 working_directory: /src/grpc-gateway environment: GLOG_logtostderr: '1' @@ -19,7 +19,7 @@ jobs: - run: bash <(curl -s https://codecov.io/bash) node_test: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.12 + - image: jfbrandhorst/grpc-gateway-build-env:1.13 working_directory: /src/grpc-gateway steps: - checkout @@ -32,7 +32,7 @@ jobs: ./node_modules/.bin/gulp generate: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.12 + - image: jfbrandhorst/grpc-gateway-build-env:1.13 working_directory: /src/grpc-gateway steps: - checkout @@ -42,7 +42,7 @@ jobs: - run: git diff --exit-code lint: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.12 + - image: jfbrandhorst/grpc-gateway-build-env:1.13 working_directory: /src/grpc-gateway steps: - checkout @@ -84,7 +84,7 @@ jobs: when: always release: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.12 + - image: jfbrandhorst/grpc-gateway-build-env:1.13 working_directory: /src/grpc-gateway steps: - checkout diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c2ac49c2bb1..fc945f7906c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ All submissions, including submissions by project members, require review. Great, it should be as simple as thus (run from the root of the directory): ```bash -docker run -v $(pwd):/src/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.12 \ +docker run -v $(pwd):/src/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.13 \ /bin/bash -c 'cd /src/grpc-gateway && \ make realclean && \ make examples SWAGGER_CODEGEN="${SWAGGER_CODEGEN}"' diff --git a/Makefile b/Makefile index 556da62ddf3..0ea0a74908d 100644 --- a/Makefile +++ b/Makefile @@ -129,8 +129,7 @@ $(GO_PLUGIN): go build -o $(GO_PLUGIN) $(GO_PLUGIN_PKG) $(RUNTIME_GO): $(RUNTIME_PROTO) $(GO_PLUGIN) - go mod vendor - protoc -I $(PROTOC_INC_PATH) --plugin=$(GO_PLUGIN) -I ./vendor/$(GO_PTYPES_ANY_PKG) -I. --go_out=$(PKGMAP),paths=source_relative:. $(RUNTIME_PROTO) + protoc -I $(PROTOC_INC_PATH) --plugin=$(GO_PLUGIN) -I. --go_out=$(PKGMAP),paths=source_relative:. $(RUNTIME_PROTO) $(OPENAPIV2_GO): $(OPENAPIV2_PROTO) $(GO_PLUGIN) protoc -I $(PROTOC_INC_PATH) --plugin=$(GO_PLUGIN) -I. --go_out=$(PKGMAP),paths=source_relative:. $(OPENAPIV2_PROTO) diff --git a/examples/proto/examplepb/non_standard_names.pb.go b/examples/proto/examplepb/non_standard_names.pb.go index 839f5537820..7637cf515fe 100644 --- a/examples/proto/examplepb/non_standard_names.pb.go +++ b/examples/proto/examplepb/non_standard_names.pb.go @@ -45,7 +45,7 @@ func (m *NonStandardMessage) Reset() { *m = NonStandardMessage{} } func (m *NonStandardMessage) String() string { return proto.CompactTextString(m) } func (*NonStandardMessage) ProtoMessage() {} func (*NonStandardMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{0} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{0} } func (m *NonStandardMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardMessage.Unmarshal(m, b) @@ -132,7 +132,7 @@ func (m *NonStandardMessage_Thing) Reset() { *m = NonStandardMessage_Thi func (m *NonStandardMessage_Thing) String() string { return proto.CompactTextString(m) } func (*NonStandardMessage_Thing) ProtoMessage() {} func (*NonStandardMessage_Thing) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{0, 0} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{0, 0} } func (m *NonStandardMessage_Thing) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardMessage_Thing.Unmarshal(m, b) @@ -170,7 +170,7 @@ func (m *NonStandardMessage_Thing_SubThing) Reset() { *m = NonStandardMe func (m *NonStandardMessage_Thing_SubThing) String() string { return proto.CompactTextString(m) } func (*NonStandardMessage_Thing_SubThing) ProtoMessage() {} func (*NonStandardMessage_Thing_SubThing) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{0, 0, 0} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{0, 0, 0} } func (m *NonStandardMessage_Thing_SubThing) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardMessage_Thing_SubThing.Unmarshal(m, b) @@ -209,7 +209,7 @@ func (m *NonStandardUpdateRequest) Reset() { *m = NonStandardUpdateReque func (m *NonStandardUpdateRequest) String() string { return proto.CompactTextString(m) } func (*NonStandardUpdateRequest) ProtoMessage() {} func (*NonStandardUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{1} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{1} } func (m *NonStandardUpdateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardUpdateRequest.Unmarshal(m, b) @@ -263,7 +263,7 @@ func (m *NonStandardMessageWithJSONNames) Reset() { *m = NonStandardMess func (m *NonStandardMessageWithJSONNames) String() string { return proto.CompactTextString(m) } func (*NonStandardMessageWithJSONNames) ProtoMessage() {} func (*NonStandardMessageWithJSONNames) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{2} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{2} } func (m *NonStandardMessageWithJSONNames) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardMessageWithJSONNames.Unmarshal(m, b) @@ -350,7 +350,7 @@ func (m *NonStandardMessageWithJSONNames_Thing) Reset() { *m = NonStanda func (m *NonStandardMessageWithJSONNames_Thing) String() string { return proto.CompactTextString(m) } func (*NonStandardMessageWithJSONNames_Thing) ProtoMessage() {} func (*NonStandardMessageWithJSONNames_Thing) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{2, 0} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{2, 0} } func (m *NonStandardMessageWithJSONNames_Thing) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardMessageWithJSONNames_Thing.Unmarshal(m, b) @@ -392,7 +392,7 @@ func (m *NonStandardMessageWithJSONNames_Thing_SubThing) String() string { } func (*NonStandardMessageWithJSONNames_Thing_SubThing) ProtoMessage() {} func (*NonStandardMessageWithJSONNames_Thing_SubThing) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{2, 0, 0} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{2, 0, 0} } func (m *NonStandardMessageWithJSONNames_Thing_SubThing) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardMessageWithJSONNames_Thing_SubThing.Unmarshal(m, b) @@ -431,7 +431,7 @@ func (m *NonStandardWithJSONNamesUpdateRequest) Reset() { *m = NonStanda func (m *NonStandardWithJSONNamesUpdateRequest) String() string { return proto.CompactTextString(m) } func (*NonStandardWithJSONNamesUpdateRequest) ProtoMessage() {} func (*NonStandardWithJSONNamesUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_non_standard_names_1ed497ab0876ca64, []int{3} + return fileDescriptor_non_standard_names_33e1f510ac1f389a, []int{3} } func (m *NonStandardWithJSONNamesUpdateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NonStandardWithJSONNamesUpdateRequest.Unmarshal(m, b) @@ -586,10 +586,10 @@ var _NonStandardService_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("examples/proto/examplepb/non_standard_names.proto", fileDescriptor_non_standard_names_1ed497ab0876ca64) + proto.RegisterFile("examples/proto/examplepb/non_standard_names.proto", fileDescriptor_non_standard_names_33e1f510ac1f389a) } -var fileDescriptor_non_standard_names_1ed497ab0876ca64 = []byte{ +var fileDescriptor_non_standard_names_33e1f510ac1f389a = []byte{ // 626 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x6f, 0xd3, 0x3c, 0x18, 0xc7, 0x95, 0x66, 0xed, 0x5a, 0x57, 0x7a, 0x5f, 0xe4, 0x21, 0x14, 0xc2, 0xa4, 0x56, 0x95, diff --git a/go.mod b/go.mod index e63e264f1b9..c83df465786 100644 --- a/go.mod +++ b/go.mod @@ -14,3 +14,5 @@ require ( gopkg.in/resty.v1 v1.12.0 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 // indirect ) + +go 1.13