Merge pull request #66 from TheThingsIndustries/feature/update

Dockerfile

@@ -109,11 +109,9 @@ RUN mkdir -p ${GOPATH}/src/github.com/danielvladco/go-proto-gql && \
     curl -sSL https://api.github.com/repos/danielvladco/go-proto-gql/tarball/v${PROTOC_GEN_GQL_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/github.com/danielvladco/go-proto-gql && \
     cd ${GOPATH}/src/github.com/danielvladco/go-proto-gql && \
     go build -ldflags '-w -s' -o /go-proto-gql-out/protoc-gen-gql ./protoc-gen-gql && \
-    go build -ldflags '-w -s' -o /go-proto-gql-out/protoc-gen-gogqlgen ./protoc-gen-gogqlgen && \
-    go build -ldflags '-w -s' -o /go-proto-gql-out/protoc-gen-gqlgencfg ./protoc-gen-gqlgencfg && \
+    go build -ldflags '-w -s' -o /go-proto-gql-out/protoc-gen-gogql ./protoc-gen-gogql && \
     install -Ds /go-proto-gql-out/protoc-gen-gql /out/usr/bin/protoc-gen-gql && \
-    install -Ds /go-proto-gql-out/protoc-gen-gogqlgen /out/usr/bin/protoc-gen-gogqlgen && \
-    install -Ds /go-proto-gql-out/protoc-gen-gqlgencfg /out/usr/bin/protoc-gen-gqlgencfg
+    install -Ds /go-proto-gql-out/protoc-gen-gogql /out/usr/bin/protoc-gen-gogql
 
 ARG PROTOC_GEN_LINT_VERSION
 RUN cd / && \

build.sh

@@ -3,25 +3,25 @@ docker build \
 --build-arg ALPINE_VERSION="${ALPINE_VERSION:-"3.12"}" \
 --build-arg DART_PROTOBUF_VERSION="${DART_PROTOBUF_VERSION:-"1.1.0"}" \
 --build-arg DART_VERSION="${DART_VERSION:-"2.10.4"}" \
---build-arg GO_VERSION="${GO_VERSION:-"1.15.3"}" \
+--build-arg GO_VERSION="${GO_VERSION:-"1.15.6"}" \
 --build-arg GRPC_GATEWAY_VERSION="${GRPC_GATEWAY_VERSION:-"1.16.0"}" \
---build-arg GRPC_JAVA_VERSION="${GRPC_JAVA_VERSION:-"1.33.0"}" \
+--build-arg GRPC_JAVA_VERSION="${GRPC_JAVA_VERSION:-"1.34.0"}" \
 --build-arg GRPC_RUST_VERSION="${GRPC_RUST_VERSION:-"0.8.2"}" \
---build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"0.11.0"}" \
---build-arg GRPC_VERSION="${GRPC_VERSION:-"1.33.2"}" \
+--build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"0.9.2"}" \
+--build-arg GRPC_VERSION="${GRPC_VERSION:-"1.34.0"}" \
 --build-arg GRPC_WEB_VERSION="${GRPC_WEB_VERSION:-"1.2.1"}" \
---build-arg NODE_VERSION="${NODE_VERSION:-"14.15.0"}" \
+--build-arg NODE_VERSION="${NODE_VERSION:-"14.15.1"}" \
 --build-arg PROTOBUF_C_VERSION="${PROTOBUF_C_VERSION:-"1.3.3"}" \
 --build-arg PROTOC_GEN_DOC_VERSION="${PROTOC_GEN_DOC_VERSION:-"1.3.2"}" \
 --build-arg PROTOC_GEN_FIELDMASK_VERSION="${PROTOC_GEN_FIELDMASK_VERSION:-"0.4.5"}" \
 --build-arg PROTOC_GEN_GO_VERSION="${PROTOC_GEN_GO_VERSION:-"1.4.3"}" \
 --build-arg PROTOC_GEN_GOGO_VERSION="${PROTOC_GEN_GOGO_VERSION:-"1.3.1"}" \
 --build-arg PROTOC_GEN_GOGOTTN_VERSION="${PROTOC_GEN_GOGOTTN_VERSION:-"3.0.14"}" \
---build-arg PROTOC_GEN_GQL_VERSION="${PROTOC_GEN_GQL_VERSION:-"0.7.3"}" \
+--build-arg PROTOC_GEN_GQL_VERSION="${PROTOC_GEN_GQL_VERSION:-"0.8.0"}" \
 --build-arg PROTOC_GEN_LINT_VERSION="${PROTOC_GEN_LINT_VERSION:-"0.2.1"}" \
 --build-arg PROTOC_GEN_VALIDATE_VERSION="${PROTOC_GEN_VALIDATE_VERSION:-"0.4.1"}" \
---build-arg RUST_PROTOBUF_VERSION="${RUST_PROTOBUF_VERSION:-"2.18.0"}" \
---build-arg RUST_VERSION="${RUST_VERSION:-"1.47.0"}" \
+--build-arg RUST_PROTOBUF_VERSION="${RUST_PROTOBUF_VERSION:-"2.18.1"}" \
+--build-arg RUST_VERSION="${RUST_VERSION:-"1.48.0"}" \
 --build-arg SWIFT_VERSION="${SWIFT_VERSION:-"5.1.5"}" \
 --build-arg TS_PROTOC_GEN_VERSION="${TS_PROTOC_GEN_VERSION:-"0.13.0"}" \
 --build-arg UPX_VERSION="${UPX_VERSION:-"3.96"}" \

go.mod

@@ -3,10 +3,10 @@ go 1.13
 module github.com/TheThingsIndustries/docker-protobuf
 
 require (
-	github.com/golang/protobuf v1.4.1 // indirect
+	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/go-querystring v1.0.0 // indirect
-	golang.org/x/net v0.0.0-20200506145744-7e3656a0809f // indirect
-	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	google.golang.org/appengine v1.6.6 // indirect
+	golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 // indirect
+	golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
+	google.golang.org/appengine v1.6.7 // indirect
 )