Bump generators Dockerfile to 1.13.1

grpc-ecosystem · Oct 2, 2019 · 78dc1a3 · 78dc1a3
1 parent ece8fdf
commit 78dc1a3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -1,29 +1,30 @@
-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 && \
     unzip /protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local/ && \
     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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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