From 1fc41d70a2864ece43bced6543d2d44cfb8bbf34 Mon Sep 17 00:00:00 2001 From: Brandon Cook Date: Wed, 29 Jan 2025 11:12:42 +0100 Subject: [PATCH] Update generator versions... --- protoc-cpp/Dockerfile | 2 +- protoc-go/Dockerfile | 7 ++++--- protoc-java/Dockerfile | 2 +- protoc-node/Dockerfile | 2 +- protoc-swift/Dockerfile | 2 +- protoc-web/Dockerfile | 2 +- protoc/Dockerfile | 4 ++-- protoc/version.txt | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/protoc-cpp/Dockerfile b/protoc-cpp/Dockerfile index ad194ea..5030b65 100644 --- a/protoc-cpp/Dockerfile +++ b/protoc-cpp/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/safetyculture/protoc:1.14.1 +FROM ghcr.io/safetyculture/protoc:1.15.0 LABEL maintainer="SafetyCulture " ENV CRUX_CLIENT_RELEASE 1.35.0 diff --git a/protoc-go/Dockerfile b/protoc-go/Dockerfile index fca6bbd..b875eca 100644 --- a/protoc-go/Dockerfile +++ b/protoc-go/Dockerfile @@ -1,10 +1,11 @@ -FROM golang:1.18.0-alpine as builder +FROM golang:1.23.0-alpine as builder ENV S12_PROTO_VERSION 1.34.0 ENV PROTOC_GEN_GO_VERSION 1.36.4 ENV PROTOC_GEN_DOC_VERSION 1.5.1 -ENV PROTOC_GEN_GO_GRPC_VERSION 1.70.0 +# This isn't the same as the repo version, run `go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest && protoc-gen-go-grpc --version` to find the version +ENV PROTOC_GEN_GO_GRPC_VERSION 1.5.1 ENV PROTOC_GEN_GO_VTPROTO_VERSION 0.6.0 ENV PROTOC_GEN_GRPC_GATEWAY_VERSION 2.26.0 @@ -12,7 +13,7 @@ ENV PROTOC_GEN_GRPC_GATEWAY_VERSION 2.26.0 ADD . /src RUN /src/build.sh -FROM ghcr.io/safetyculture/protoc:1.14.1 +FROM ghcr.io/safetyculture/protoc:1.15.0 LABEL maintainer="SafetyCulture " ENV PATH /usr/local/go/bin:$PATH diff --git a/protoc-java/Dockerfile b/protoc-java/Dockerfile index 5036481..67da972 100644 --- a/protoc-java/Dockerfile +++ b/protoc-java/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 as javalite_builder RUN apt-get update && \ apt-get install -y bash patch curl patchelf -FROM ghcr.io/safetyculture/protoc:1.14.1 +FROM ghcr.io/safetyculture/protoc:1.15.0 LABEL maintainer="SafetyCulture " ENV GRPC_JAVA_VERSION=1.27.0 diff --git a/protoc-node/Dockerfile b/protoc-node/Dockerfile index c3cd486..160e1c7 100644 --- a/protoc-node/Dockerfile +++ b/protoc-node/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/safetyculture/protoc:1.14.1 +FROM ghcr.io/safetyculture/protoc:1.15.0 LABEL maintainer="SafetyCulture " RUN apk add --no-cache npm diff --git a/protoc-swift/Dockerfile b/protoc-swift/Dockerfile index 8c54117..4120e91 100644 --- a/protoc-swift/Dockerfile +++ b/protoc-swift/Dockerfile @@ -5,7 +5,7 @@ ENV GRPC_RELEASE=1.7.3 ADD . /src RUN /src/build.sh -FROM ghcr.io/safetyculture/protoc:1.14.1 +FROM ghcr.io/safetyculture/protoc:1.15.0 LABEL maintainer="SafetyCulture " COPY --from=swift_builder /plugins /plugins diff --git a/protoc-web/Dockerfile b/protoc-web/Dockerfile index 3fa28ef..6621a52 100644 --- a/protoc-web/Dockerfile +++ b/protoc-web/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/safetyculture/protoc:1.14.1 +FROM ghcr.io/safetyculture/protoc:1.15.0 LABEL maintainer="SafetyCulture " ENV GRPC_WEB_RELEASE 1.0.4 diff --git a/protoc/Dockerfile b/protoc/Dockerfile index e84c7a6..84f45e8 100644 --- a/protoc/Dockerfile +++ b/protoc/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine:3.15 +FROM alpine:3.21 LABEL maintainer="SafetyCulture " RUN apk add --no-cache protoc grpc RUN mkdir /defs -COPY --from=bufbuild/buf:1.8.0 /usr/local/bin/buf /usr/local/bin/buf +COPY --from=bufbuild/buf:1.50.0 /usr/local/bin/buf /usr/local/bin/buf # Setup directories for the volumes that should be used WORKDIR /defs diff --git a/protoc/version.txt b/protoc/version.txt index 63e799c..141f2e8 100644 --- a/protoc/version.txt +++ b/protoc/version.txt @@ -1 +1 @@ -1.14.1 +1.15.0