From ef56e25292bb4478107cfda8a8adf30f541ac03c Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 6 Jan 2022 12:54:33 +0100 Subject: [PATCH 1/5] check-versions.go: Remove TTI tools --- check-versions.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/check-versions.go b/check-versions.go index 078f9bf2..6c492e94 100755 --- a/check-versions.go +++ b/check-versions.go @@ -54,11 +54,9 @@ func main() { {"grpc", "grpc-web"}, {"protobuf-c", "protobuf-c"}, {"pseudomuto", "protoc-gen-doc"}, - {"TheThingsIndustries", "protoc-gen-fieldmask"}, {"grpc", "grpc-go"}, {"golang", "protobuf"}, {"gogo", "protobuf"}, - {"TheThingsIndustries", "protoc-gen-gogottn"}, {"mwitkow", "go-proto-validators"}, {"danielvladco", "go-proto-gql"}, {"ckaznocha", "protoc-gen-lint"}, From 319b9c49362aad012bda271c684a1b9aa748a205 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 6 Jan 2022 13:01:17 +0100 Subject: [PATCH 2/5] build.sh: Update dependencies --- build.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/build.sh b/build.sh index 89e86684..1b6acfb2 100755 --- a/build.sh +++ b/build.sh @@ -1,31 +1,31 @@ #!/usr/bin/env bash docker build \ ---build-arg ALPINE_VERSION="${ALPINE_VERSION:-"3.14"}" \ ---build-arg DART_PROTOBUF_VERSION="${DART_PROTOBUF_VERSION:-"2.0.0"}" \ +--build-arg ALPINE_VERSION="${ALPINE_VERSION:-"3.15"}" \ +--build-arg DART_PROTOBUF_VERSION="${DART_PROTOBUF_VERSION:-"2.0.1"}" \ --build-arg DART_VERSION="${DART_VERSION:-"2.13.4"}" \ +--build-arg GO_VERSION="${GO_VERSION:-"1.17.5"}" \ --build-arg GOOGLE_API_VERSION="d9b32e92fa57c37e5af0dc03badfe741170c5849" \ ---build-arg GO_VERSION="${GO_VERSION:-"1.17.0"}" \ ---build-arg GRPC_GATEWAY_VERSION="${GRPC_GATEWAY_VERSION:-"2.3.0"}" \ ---build-arg GRPC_JAVA_VERSION="${GRPC_JAVA_VERSION:-"1.36.0"}" \ ---build-arg GRPC_RUST_VERSION="${GRPC_RUST_VERSION:-"0.8.2"}" \ ---build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"1.0.0"}" \ ---build-arg GRPC_VERSION="${GRPC_VERSION:-"1.36.4"}" \ ---build-arg GRPC_WEB_VERSION="${GRPC_WEB_VERSION:-"1.2.1"}" \ ---build-arg NODE_VERSION="${NODE_VERSION:-"14.17.5"}" \ ---build-arg PROTOBUF_C_VERSION="${PROTOBUF_C_VERSION:-"1.3.3"}" \ ---build-arg PROTOC_GEN_DOC_VERSION="${PROTOC_GEN_DOC_VERSION:-"1.4.1"}" \ ---build-arg PROTOC_GEN_GO_GRPC_VERSION="${PROTOC_GEN_GO_GRPC_VERSION:-"1.36.0"}" \ +--build-arg GRPC_GATEWAY_VERSION="${GRPC_GATEWAY_VERSION:-"2.7.2"}" \ +--build-arg GRPC_JAVA_VERSION="${GRPC_JAVA_VERSION:-"1.43.1"}" \ +--build-arg GRPC_RUST_VERSION="${GRPC_RUST_VERSION:-"0.8.3"}" \ +--build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"1.6.1"}" \ +--build-arg GRPC_VERSION="${GRPC_VERSION:-"1.43.0"}" \ +--build-arg GRPC_WEB_VERSION="${GRPC_WEB_VERSION:-"1.3.0"}" \ +--build-arg NODE_VERSION="${NODE_VERSION:-"17.3.0"}" \ +--build-arg PROTOBUF_C_VERSION="${PROTOBUF_C_VERSION:-"1.4.0"}" \ +--build-arg PROTOC_GEN_DOC_VERSION="${PROTOC_GEN_DOC_VERSION:-"1.5.0"}" \ +--build-arg PROTOC_GEN_GO_GRPC_VERSION="${PROTOC_GEN_GO_GRPC_VERSION:-"1.43.0"}" \ --build-arg PROTOC_GEN_GO_VERSION="${PROTOC_GEN_GO_VERSION:-"1.27.1"}" \ --build-arg PROTOC_GEN_GOGO_VERSION="${PROTOC_GEN_GOGO_VERSION:-"1.3.2"}" \ --build-arg PROTOC_GEN_GOVALIDATORS_VERSION="${PROTOC_GEN_GOVALIDATORS_VERSION:-"0.3.2"}" \ --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.6.1"}" \ ---build-arg RUST_PROTOBUF_VERSION="${RUST_PROTOBUF_VERSION:-"2.22.1"}" \ ---build-arg RUST_VERSION="${RUST_VERSION:-"1.50.0"}" \ ---build-arg SWIFT_VERSION="${SWIFT_VERSION:-"5.2.5"}" \ ---build-arg TS_PROTOC_GEN_VERSION="${TS_PROTOC_GEN_VERSION:-"0.14.0"}" \ +--build-arg PROTOC_GEN_LINT_VERSION="${PROTOC_GEN_LINT_VERSION:-"0.2.4"}" \ +--build-arg PROTOC_GEN_VALIDATE_VERSION="${PROTOC_GEN_VALIDATE_VERSION:-"0.6.2"}" \ +--build-arg RUST_PROTOBUF_VERSION="${RUST_PROTOBUF_VERSION:-"2.25.2"}" \ +--build-arg RUST_VERSION="${RUST_VERSION:-"1.57.0"}" \ +--build-arg SWIFT_VERSION="${SWIFT_VERSION:-"5.5.2"}" \ +--build-arg TS_PROTOC_GEN_VERSION="${TS_PROTOC_GEN_VERSION:-"0.15.0"}" \ --build-arg UPX_VERSION="${UPX_VERSION:-"3.96"}" \ ---build-arg JSONSCHEMA_VERSION="${JSONSCHEMA_VERSION:-"1.3.1"}" \ --build-arg GOTEMPLATE_VERSION="${GOTEMPLATE_VERSION:-"1.11.2"}" \ +--build-arg JSONSCHEMA_VERSION="${JSONSCHEMA_VERSION:-"1.3.5"}" \ ${@} . From 85863dbfae4efc1d9ae142302643743fe25aa15a Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 6 Jan 2022 13:04:15 +0100 Subject: [PATCH 3/5] go.{mod,sum}: Update dependencies --- go.mod | 18 +++++++++++------- go.sum | 25 ++++++++----------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 59526e9e..a4c3fe86 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,16 @@ -go 1.13 - module github.com/rvolosatovs/docker-protobuf +go 1.17 + require ( - 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-20201209123823-ac852fbbde11 // indirect - golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 - google.golang.org/appengine v1.6.7 // indirect + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 +) + +require ( + github.com/golang/protobuf v1.4.2 // indirect + github.com/google/go-querystring v1.1.0 // indirect + golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/protobuf v1.25.0 // indirect ) diff --git a/go.sum b/go.sum index ac784c35..73de19fd 100644 --- a/go.sum +++ b/go.sum @@ -69,11 +69,9 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -82,12 +80,13 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -177,23 +176,20 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 h1:Lm4OryKCca1vehdsWogr9N4t7NfZxLbJoc/H0w4K4S4= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -227,8 +223,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -305,8 +299,6 @@ google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -353,7 +345,6 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0 h1:cJv5/xdbk1NnMPR1VP9+HU6gupuG9MLBoH1r6RHZ2MY= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= From 0e0012753b50ee40a7313e67e7d8e49b1c8174a5 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 7 Jan 2022 18:06:56 +0100 Subject: [PATCH 4/5] check-versions.go: Update protoc-gen-go URL --- check-versions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check-versions.go b/check-versions.go index 6c492e94..e3d2fcd8 100755 --- a/check-versions.go +++ b/check-versions.go @@ -55,7 +55,7 @@ func main() { {"protobuf-c", "protobuf-c"}, {"pseudomuto", "protoc-gen-doc"}, {"grpc", "grpc-go"}, - {"golang", "protobuf"}, + {"protocolbuffers", "protobuf-go"}, {"gogo", "protobuf"}, {"mwitkow", "go-proto-validators"}, {"danielvladco", "go-proto-gql"}, From 6b999b6155b49d0a0b42c78b3592ea411b009671 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 7 Jan 2022 18:07:46 +0100 Subject: [PATCH 5/5] build.sh: Sort alphabetically --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 1b6acfb2..757e0d0c 100755 --- a/build.sh +++ b/build.sh @@ -5,12 +5,14 @@ docker build \ --build-arg DART_VERSION="${DART_VERSION:-"2.13.4"}" \ --build-arg GO_VERSION="${GO_VERSION:-"1.17.5"}" \ --build-arg GOOGLE_API_VERSION="d9b32e92fa57c37e5af0dc03badfe741170c5849" \ +--build-arg GOTEMPLATE_VERSION="${GOTEMPLATE_VERSION:-"1.11.2"}" \ --build-arg GRPC_GATEWAY_VERSION="${GRPC_GATEWAY_VERSION:-"2.7.2"}" \ --build-arg GRPC_JAVA_VERSION="${GRPC_JAVA_VERSION:-"1.43.1"}" \ --build-arg GRPC_RUST_VERSION="${GRPC_RUST_VERSION:-"0.8.3"}" \ --build-arg GRPC_SWIFT_VERSION="${GRPC_SWIFT_VERSION:-"1.6.1"}" \ --build-arg GRPC_VERSION="${GRPC_VERSION:-"1.43.0"}" \ --build-arg GRPC_WEB_VERSION="${GRPC_WEB_VERSION:-"1.3.0"}" \ +--build-arg JSONSCHEMA_VERSION="${JSONSCHEMA_VERSION:-"1.3.5"}" \ --build-arg NODE_VERSION="${NODE_VERSION:-"17.3.0"}" \ --build-arg PROTOBUF_C_VERSION="${PROTOBUF_C_VERSION:-"1.4.0"}" \ --build-arg PROTOC_GEN_DOC_VERSION="${PROTOC_GEN_DOC_VERSION:-"1.5.0"}" \ @@ -26,6 +28,4 @@ docker build \ --build-arg SWIFT_VERSION="${SWIFT_VERSION:-"5.5.2"}" \ --build-arg TS_PROTOC_GEN_VERSION="${TS_PROTOC_GEN_VERSION:-"0.15.0"}" \ --build-arg UPX_VERSION="${UPX_VERSION:-"3.96"}" \ ---build-arg GOTEMPLATE_VERSION="${GOTEMPLATE_VERSION:-"1.11.2"}" \ ---build-arg JSONSCHEMA_VERSION="${JSONSCHEMA_VERSION:-"1.3.5"}" \ ${@} .