From f493bd961b6f18a307e1c6d5efe40d4980135352 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 11:03:55 +0100 Subject: [PATCH 1/8] Update grpc-gateway to 2.15.2 and add protoc-gen-go-grpc 1.3.0 Signed-off-by: Matthieu MOREL --- .github/workflows/jaeger-dockerimage.yml | 2 +- Dockerfile | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/jaeger-dockerimage.yml b/.github/workflows/jaeger-dockerimage.yml index 1cb5382..411a7d0 100644 --- a/.github/workflows/jaeger-dockerimage.yml +++ b/.github/workflows/jaeger-dockerimage.yml @@ -15,7 +15,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Build the Docker image run: docker build . -t build - name: Push the Docker image diff --git a/Dockerfile b/Dockerfile index 33575f5..89def56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ ARG ALPINE_VERSION=3.13 ARG GO_VERSION=1.17.3 -ARG GRPC_GATEWAY_VERSION=1.16.0 +ARG GRPC_GATEWAY_VERSION=2.15.2 ARG GRPC_JAVA_VERSION=1.35.0 ARG GRPC_CSHARP_VERSION=1.35.0 ARG GRPC_VERSION=1.35.0 ARG PROTOC_GEN_GO_VERSION=1.31.0 +ARG PROTOC_GEN_GO_GRPC_VERSION=1.3.0 # v1.3.2, using the version directly does not work: "tar: invalid magic" ARG PROTOC_GEN_GOGO_VERSION=b03c65ea87cdc3521ede29f62fe3ce239267c1bc ARG PROTOC_GEN_LINT_VERSION=0.2.1 @@ -101,17 +102,13 @@ ARG GRPC_GATEWAY_VERSION RUN mkdir -p ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway && \ curl -sSL https://api.github.com/repos/grpc-ecosystem/grpc-gateway/tarball/v${GRPC_GATEWAY_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway && \ cd ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway && \ - go build -ldflags '-w -s' -o /grpc-gateway-out/protoc-gen-grpc-gateway ./protoc-gen-grpc-gateway && \ - go build -ldflags '-w -s' -o /grpc-gateway-out/protoc-gen-swagger ./protoc-gen-swagger && \ - install -Ds /grpc-gateway-out/protoc-gen-grpc-gateway /out/usr/bin/protoc-gen-grpc-gateway && \ - install -Ds /grpc-gateway-out/protoc-gen-swagger /out/usr/bin/protoc-gen-swagger && \ - mkdir -p /out/usr/include/protoc-gen-swagger/options && \ - install -D $(find ./protoc-gen-swagger/options -name '*.proto') -t /out/usr/include/protoc-gen-swagger/options && \ - mkdir -p /out/usr/include/google/api && \ - install -D $(find ./third_party/googleapis/google/api -name '*.proto') -t /out/usr/include/google/api && \ - mkdir -p /out/usr/include/google/rpc && \ - install -D $(find ./third_party/googleapis/google/rpc -name '*.proto') -t /out/usr/include/google/rpc + mkdir -p /out/usr/include/protoc-gen-openapiv2/options && \ + install -D $(find ./protoc-gen-openapiv2/options -name '*.proto') -t /out/usr/include/protoc-gen-openapiv2/options && \ + go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION} && \ + go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v${GRPC_GATEWAY_VERSION} +ARG PROTOC_GEN_GO_GRPC_VERSION +RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v${PROTOC_GEN_GO_GRPC_VERSION} FROM alpine:${ALPINE_VERSION} as packer RUN apk add --no-cache curl From 31373552931e83ea4696944e98c1c73a29592d19 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 14:10:05 +0100 Subject: [PATCH 2/8] Update upx to 4.2.1 Signed-off-by: Matthieu MOREL --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 89def56..afa0a8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG PROTOC_GEN_GO_GRPC_VERSION=1.3.0 # v1.3.2, using the version directly does not work: "tar: invalid magic" ARG PROTOC_GEN_GOGO_VERSION=b03c65ea87cdc3521ede29f62fe3ce239267c1bc ARG PROTOC_GEN_LINT_VERSION=0.2.1 -ARG UPX_VERSION=3.96 +ARG UPX_VERSION=4.2.1 FROM alpine:${ALPINE_VERSION} as protoc_base RUN apk add --no-cache build-base curl cmake autoconf libtool git zlib-dev linux-headers && \ From 8b2a740aead11047a1aaa91c48a0c57ade3cc0f6 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 14:52:03 +0100 Subject: [PATCH 3/8] Update protoc-gen-lint to 0.3.0 Signed-off-by: Matthieu MOREL --- Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index afa0a8d..72181d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG PROTOC_GEN_GO_VERSION=1.31.0 ARG PROTOC_GEN_GO_GRPC_VERSION=1.3.0 # v1.3.2, using the version directly does not work: "tar: invalid magic" ARG PROTOC_GEN_GOGO_VERSION=b03c65ea87cdc3521ede29f62fe3ce239267c1bc -ARG PROTOC_GEN_LINT_VERSION=0.2.1 +ARG PROTOC_GEN_LINT_VERSION=0.3.0 ARG UPX_VERSION=4.2.1 FROM alpine:${ALPINE_VERSION} as protoc_base @@ -91,12 +91,7 @@ RUN mkdir -p ${GOPATH}/src/github.com/gogo/protobuf && \ install -D ./gogoproto/gogo.proto /out/usr/include/github.com/gogo/protobuf/gogoproto/gogo.proto ARG PROTOC_GEN_LINT_VERSION -RUN cd / && \ - curl -sSLO https://github.com/ckaznocha/protoc-gen-lint/releases/download/v${PROTOC_GEN_LINT_VERSION}/protoc-gen-lint_linux_amd64.zip && \ - mkdir -p /protoc-gen-lint-out && \ - cd /protoc-gen-lint-out && \ - unzip -q /protoc-gen-lint_linux_amd64.zip && \ - install -Ds /protoc-gen-lint-out/protoc-gen-lint /out/usr/bin/protoc-gen-lint +RUN go install github.com/ckaznocha/protoc-gen-lint@v${PROTOC_GEN_LINT_VERSION} ARG GRPC_GATEWAY_VERSION RUN mkdir -p ${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway && \ From 12b8a69154114f600980bfd690813a659f463db4 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 17:06:03 +0100 Subject: [PATCH 4/8] Update grpc to 1.40.0 Signed-off-by: Matthieu MOREL --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72181d9..f06655e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ ARG ALPINE_VERSION=3.13 ARG GO_VERSION=1.17.3 ARG GRPC_GATEWAY_VERSION=2.15.2 -ARG GRPC_JAVA_VERSION=1.35.0 -ARG GRPC_CSHARP_VERSION=1.35.0 -ARG GRPC_VERSION=1.35.0 +ARG GRPC_JAVA_VERSION=1.40.0 +ARG GRPC_CSHARP_VERSION=1.40.0 +ARG GRPC_VERSION=1.40.0 ARG PROTOC_GEN_GO_VERSION=1.31.0 ARG PROTOC_GEN_GO_GRPC_VERSION=1.3.0 # v1.3.2, using the version directly does not work: "tar: invalid magic" From ebc61f3aa4672c940fb9bf72a1af5bf9a6bd11f9 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 17:44:57 +0100 Subject: [PATCH 5/8] Update Grpc to 1.50.0 Signed-off-by: Matthieu MOREL --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f06655e..14d26e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ ARG ALPINE_VERSION=3.13 ARG GO_VERSION=1.17.3 ARG GRPC_GATEWAY_VERSION=2.15.2 -ARG GRPC_JAVA_VERSION=1.40.0 -ARG GRPC_CSHARP_VERSION=1.40.0 -ARG GRPC_VERSION=1.40.0 +ARG GRPC_JAVA_VERSION=1.50.0 +ARG GRPC_CSHARP_VERSION=1.50.0 +ARG GRPC_VERSION=1.50.0 ARG PROTOC_GEN_GO_VERSION=1.31.0 ARG PROTOC_GEN_GO_GRPC_VERSION=1.3.0 # v1.3.2, using the version directly does not work: "tar: invalid magic" From e7a78cbc5415726eb3d6be724978924be35cc892 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 21:59:42 +0100 Subject: [PATCH 6/8] Update Alpine to 3.15 Signed-off-by: Matthieu MOREL --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14d26e0..0f96159 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG ALPINE_VERSION=3.13 +ARG ALPINE_VERSION=3.15 ARG GO_VERSION=1.17.3 ARG GRPC_GATEWAY_VERSION=2.15.2 ARG GRPC_JAVA_VERSION=1.50.0 @@ -60,12 +60,6 @@ RUN git clone --recursive --depth=1 -b v${GRPC_CSHARP_VERSION} https://github.co cmake \ -DCMAKE_BUILD_TYPE=Release \ -DgRPC_BUILD_TESTS=OFF \ - -gRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ - -gRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ - -gRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF \ - -gRPC_BUILD_GRPC_PHP_PLUGIN=OFF \ - -gRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ - -gRPC_BUILD_GRPC_RUBY_PLUGIN=OFF \ -DgRPC_INSTALL=ON \ -DCMAKE_INSTALL_PREFIX=/out/usr \ ../.. && \ From f85e80b29ec915fbf7d77daaded31c30a4d4ba73 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 22:33:30 +0100 Subject: [PATCH 7/8] Update Golang to 1.19.3 Signed-off-by: Matthieu MOREL --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f96159..8350774 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG ALPINE_VERSION=3.15 -ARG GO_VERSION=1.17.3 +ARG GO_VERSION=1.19.3 ARG GRPC_GATEWAY_VERSION=2.15.2 ARG GRPC_JAVA_VERSION=1.50.0 ARG GRPC_CSHARP_VERSION=1.50.0 From 96c670f236ae66ab35859c1e837948317dfb08e9 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 5 Nov 2023 23:35:37 +0100 Subject: [PATCH 8/8] Update Grpc gateway to 2.18.0 Signed-off-by: Matthieu MOREL --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8350774..1275624 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG ALPINE_VERSION=3.15 -ARG GO_VERSION=1.19.3 -ARG GRPC_GATEWAY_VERSION=2.15.2 +ARG ALPINE_VERSION=3.18 +ARG GO_VERSION=1.21.3 +ARG GRPC_GATEWAY_VERSION=2.18.0 ARG GRPC_JAVA_VERSION=1.50.0 ARG GRPC_CSHARP_VERSION=1.50.0 ARG GRPC_VERSION=1.50.0 @@ -72,7 +72,9 @@ RUN apk add --no-cache build-base curl git ENV GOBIN=/out/usr/bin ARG PROTOC_GEN_GO_VERSION -RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} +RUN mkdir -p ${GOPATH}/src/google.golang.org/protobuf && \ + curl -sSL https://api.github.com/repos/protocolbuffers/protobuf-go/tarball/v${PROTOC_GEN_GO_VERSION} | tar xz --strip 1 -C ${GOPATH}/src/google.golang.org/protobuf &&\ + go install google.golang.org/protobuf/cmd/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} ARG PROTOC_GEN_GOGO_VERSION RUN mkdir -p ${GOPATH}/src/github.com/gogo/protobuf && \