Skip to content

(CHORE)[EX-3143] Upgrade protoc-cpp with protoc 1.15 #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Michael Gunawan (scmichaelg) wants to merge 6 commits into from
Closed

(CHORE)[EX-3143] Upgrade protoc-cpp with protoc 1.15 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2b6832
feat: upgrade protoc base image to Alpine 3.21 with buf 1.66.0
scmichaelg Mar 28, 2026
a31eab4
fix: bump protoc-go to Go 1.24.0
scmichaelg Mar 28, 2026
7f3b725
Upgrade base protoc and protoc-cpp images to Alpine 3.21
pdeaudney Mar 2, 2026
1add610
Bumped s12-proto to 1.38.0
scmichaelg Mar 28, 2026
69bf725
ci: bypass pre-release tag for protoc and protoc-cpp images
scmichaelg Mar 28, 2026
a4a9ee9
fix: add grpc-plugins package to protoc base image
scmichaelg Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions protoc-cpp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/safetyculture/protoc:1.14.2
FROM ghcr.io/safetyculture/protoc:1.15.0
LABEL maintainer="SafetyCulture <info@safetyculture.io>"

ENV CRUX_CLIENT_RELEASE 1.36.0
ENV CRUX_CLIENT_RELEASE=1.38.0

# install dependencies and build/install grpc plugin
ADD . /src
Expand Down
8 changes: 7 additions & 1 deletion protoc-cpp/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
set -e

apk add --no-cache libstdc++
apk add --no-cache --virtual .build protobuf-dev libprotobuf libprotoc git openssl binutils-gold g++ gcc gnupg libgcc linux-headers make cmake autoconf automake libtool
apk add --no-cache --virtual .build protobuf-dev abseil-cpp-dev libprotobuf libprotoc git openssl binutils-gold g++ gcc gnupg libgcc linux-headers make cmake autoconf automake libtool pkgconf

# Install the protoc-gen-cruxclient plugin
mkdir -p /usr/local/cruxclient
git clone https://github.com/SafetyCulture/s12-proto.git /usr/local/cruxclient
cd /usr/local/cruxclient
git checkout v$CRUX_CLIENT_RELEASE

# Regenerate wire_options.pb.cc/h to match the container's protobuf version
protoc -I protobuf/protoc-gen-cruxclient \
--cpp_out=protobuf/protoc-gen-cruxclient/ \
protobuf/protoc-gen-cruxclient/wire_options.proto

make install-cruxclient

rm -rf /usr/local/cruxclient
Expand Down
2 changes: 1 addition & 1 deletion protoc-cpp/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.12.4
1.13.0
2 changes: 1 addition & 1 deletion protoc-go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.0-alpine as builder
FROM golang:1.24.0-alpine as builder

ENV S12_PROTO_VERSION 1.37.0

Expand Down
2 changes: 1 addition & 1 deletion protoc-go/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.25.6
3.26.0
6 changes: 3 additions & 3 deletions protoc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM alpine:3.15
FROM alpine:3.21
LABEL maintainer="SafetyCulture <info@safetyculture.io>"

RUN apk add --no-cache protoc grpc
RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.21/community protoc grpc grpc-plugins
RUN mkdir /defs

COPY --from=bufbuild/buf:1.8.0 /usr/local/bin/buf /usr/local/bin/buf
COPY --from=bufbuild/buf:1.66.0 /usr/local/bin/buf /usr/local/bin/buf

# Setup directories for the volumes that should be used
WORKDIR /defs
2 changes: 1 addition & 1 deletion protoc/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.2
1.15.0
2 changes: 1 addition & 1 deletion publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PLATFORM="linux/amd64,linux/arm64"
VERSION_FILE="$IMAGE/version.txt"

TAG=`cat $VERSION_FILE`
if [ "$RELEASE_TAG" != "true" ]; then
if [ "$RELEASE_TAG" != "true" ] && [ "$IMAGE" != "protoc" ] && [ "$IMAGE" != "protoc-cpp" ]; then
TAG="$TAG-pre$(date +%Y%m%d%H%M%S)"
fi

Expand Down
Loading