Skip to content

build: downgrade multiarch to Ubuntu 20.04 and consolidate images #12830

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
kannanjgithub wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −28
Open

build: downgrade multiarch to Ubuntu 20.04 and consolidate images #12830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion buildscripts/build_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ set -eu -o pipefail
readonly buildscripts_dir="$(dirname "$(readlink -f "$0")")"
docker build -t grpc-java-artifacts-x86 "$buildscripts_dir"/grpc-java-artifacts
docker build -t grpc-java-artifacts-multiarch -f "$buildscripts_dir"/grpc-java-artifacts/Dockerfile.multiarch.base "$buildscripts_dir"/grpc-java-artifacts
docker build -t grpc-java-artifacts-ubuntu2004 -f "$buildscripts_dir"/grpc-java-artifacts/Dockerfile.ubuntu2004.base "$buildscripts_dir"/grpc-java-artifacts

8 changes: 3 additions & 5 deletions buildscripts/grpc-java-artifacts/Dockerfile.multiarch.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
FROM ubuntu:24.04

# Redirect to the internal mirror to bypass the Kokoro network block
RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirror.bazel.build/archive.ubuntu.com/ubuntu/|g' /etc/apt/sources.list
FROM ubuntu:20.04

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
Expand All @@ -12,8 +9,9 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
curl \
g++-aarch64-linux-gnu \
g++-powerpc64le-linux-gnu \
g++-s390x-linux-gnu \
openjdk-11-jdk \
pkgconf \
pkg-config \
&& \
rm -rf /var/lib/apt/lists/*

Expand Down
19 changes: 0 additions & 19 deletions buildscripts/grpc-java-artifacts/Dockerfile.ubuntu2004.base
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions buildscripts/kokoro/linux_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@ trap spongify_logs EXIT
SKIP_TESTS=true ARCH=aarch_64 /grpc-java/buildscripts/kokoro/unix.sh
"$GRPC_JAVA_DIR"/buildscripts/run_in_docker.sh grpc-java-artifacts-multiarch env \
SKIP_TESTS=true ARCH=ppcle_64 /grpc-java/buildscripts/kokoro/unix.sh
# Use a newer GCC version. GCC 7 in multiarch has a bug:
# internal compiler error: output_operand: invalid %-code
"$GRPC_JAVA_DIR"/buildscripts/run_in_docker.sh grpc-java-artifacts-ubuntu2004 env \
"$GRPC_JAVA_DIR"/buildscripts/run_in_docker.sh grpc-java-artifacts-multiarch env \
SKIP_TESTS=true ARCH=s390_64 /grpc-java/buildscripts/kokoro/unix.sh
Loading