Skip to content

Extend install-proto script to use local file from Hermeto #274

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

Open
xperimental wants to merge 3 commits into
base: v0.54.0-rh
Choose a base branch
from
+19 −5
Open

Extend install-proto script to use local file from Hermeto #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4ef3dd
Update install-protoc script to look for cachi2 file
xperimental May 28, 2026
de00230
Use install-protoc script in ART build
xperimental May 28, 2026
f2bf778
Fix filenames for s390x and ppc64le
xperimental May 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
3 changes: 2 additions & 1 deletion Dockerfile.art
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ RUN INSTALL_PKGS=" \
gcc-c++ \
git \
make \
unzip \
openssl-devel \
llvm-toolset \
rust-toolset-1.88.0 \
crypto-policies-scripts \
protobuf-compiler \
" && \
microdnf install -y $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS
Expand All @@ -19,6 +19,7 @@ RUN update-crypto-policies --set DEFAULT:PQ
COPY . /opt/app-root/src
WORKDIR /opt/app-root/src

RUN scripts/environment/install-protoc.sh
RUN make build-offline

# Strip binary to reduce image size for DaemonSet deployment
Expand Down
21 changes: 17 additions & 4 deletions scripts/environment/install-protoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ get_arch() {
echo "aarch_64"
elif [[ "${os}" == "Linux" && "${arch}" == "aarch64" ]]; then
echo "aarch_64"
elif [[ "${arch}" == "s390x" ]]; then
echo "s390_64"
elif [[ "${arch}" == "ppc64le" ]]; then
echo "ppcle_64"
else
echo "${arch}"
fi
Expand All @@ -52,12 +56,21 @@ install_protoc() {
local install_path=$2

local base_url="https://github.com/protocolbuffers/protobuf/releases/download"
local url
url="${base_url}/v${version}/protoc-${version}-$(get_platform)-$(get_arch).zip"
local filename
filename="protoc-${version}-$(get_platform)-$(get_arch).zip"
local download_path="${TMP_DIR}/protoc.zip"

echo "Downloading ${url}"
curl -fsSL "${url}" -o "${download_path}"
local cachi_file
cachi_file="/cachi2/output/deps/generic/${filename}"
if [ -e "${cachi_file}" ]; then
echo "Using ${filename} from cachi2"
cp "${cachi_file}" "${download_path}"
else
local url
url="${base_url}/v${version}/${filename}"
echo "Downloading ${url}"
curl -fsSL "${url}" -o "${download_path}"
fi

unzip -qq "${download_path}" -d "${TMP_DIR}"
mv -f -v "${TMP_DIR}/bin/protoc" "${install_path}"
Expand Down