diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index c44eac5c23d..2eff32c6fdb 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13.4 +FROM golang:1.14.0 # Warm apt cache and install dependencies # bzip2 is required by the node_tests (to extract its dependencies). @@ -9,7 +9,7 @@ RUN apt-get update && \ # Install swagger-codegen ENV SWAGGER_CODEGEN_VERSION=2.4.8 -RUN wget http://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/${SWAGGER_CODEGEN_VERSION}/swagger-codegen-cli-${SWAGGER_CODEGEN_VERSION}.jar \ +RUN wget https://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 # Wrap the jar for swagger-codgen diff --git a/.circleci/README.md b/.circleci/README.md index c6ce14672fb..5fe0b18c863 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.13 \ +$ docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.14 \ /bin/bash -c 'cd /go/src/github.com/grpc-ecosystem/grpc-gateway && \ make realclean && \ make examples' diff --git a/.circleci/config.yml b/.circleci/config.yml index 7dc1c25c06f..bcada21745b 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.13 + - image: jfbrandhorst/grpc-gateway-build-env:1.14 working_directory: /src/grpc-gateway steps: - checkout - run: go build ./... test: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.13 + - image: jfbrandhorst/grpc-gateway-build-env:1.14 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.13 + - image: jfbrandhorst/grpc-gateway-build-env:1.14 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.13 + - image: jfbrandhorst/grpc-gateway-build-env:1.14 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.13 + - image: jfbrandhorst/grpc-gateway-build-env:1.14 working_directory: /src/grpc-gateway steps: - checkout @@ -84,7 +84,7 @@ jobs: when: always release: docker: - - image: jfbrandhorst/grpc-gateway-build-env:1.13 + - image: jfbrandhorst/grpc-gateway-build-env:1.14 working_directory: /src/grpc-gateway steps: - checkout diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e2ff6602e2e..5fde7c282f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,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.13 \ +docker run -v $(pwd):/src/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.14 \ /bin/bash -c 'cd /src/grpc-gateway && \ make realclean && \ make examples' diff --git a/go.mod b/go.mod index 23003a8626f..c8e880d3044 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grpc-ecosystem/grpc-gateway -go 1.13 +go 1.14 require ( github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6