From 1b84336712355a67114c9898f47b2f8affc13452 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 6 Dec 2024 17:59:28 +0000 Subject: [PATCH 1/3] deps: update docker.io/library/alpine docker tag to v3.21.0 --- .cloudbuild/library_generation/library_generation.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index dfe4c262cd..1dc2fd55d4 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -27,7 +27,7 @@ RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \ "./gapic-generator-java.jar" -FROM docker.io/library/alpine:3.20.3@sha256:1e42bbe2508154c9126d48c2b8a75420c3544343bf86fd041fb7527e017a4b4a as glibc-compat +FROM docker.io/library/alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4eeba26dfc947b2a4f81f686b9f45 as glibc-compat RUN apk add git sudo # This SHA is the latest known-to-work version of this binary compatibility tool From 5ffffae87bc51afb4bf6ecc23497138dcce04ca8 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Fri, 6 Dec 2024 13:37:18 -0500 Subject: [PATCH 2/3] update glib sha --- .cloudbuild/library_generation/library_generation.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index 1dc2fd55d4..77e7cfeeaa 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -31,7 +31,7 @@ FROM docker.io/library/alpine:3.21.0@sha256:21dc6063fd678b478f57c0e13f47560d0ea4 RUN apk add git sudo # This SHA is the latest known-to-work version of this binary compatibility tool -ARG GLIB_MUS_SHA=7717dd4dc26377dd9cedcc92b72ebf35f9e68a2d +ARG GLIB_MUS_SHA=e94aca542e3ab08b42aa0b0d6e72478b935bb8e8 WORKDIR /home # Install compatibility layer to run glibc-based programs (such as the From 9bb5cfe55489ef3107d76d91d9edea2eedaabd8d Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Sat, 7 Dec 2024 00:44:58 +0000 Subject: [PATCH 3/3] introduce newly necessary shared objects --- .cloudbuild/library_generation/library_generation.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile index 77e7cfeeaa..8870d0da5f 100644 --- a/.cloudbuild/library_generation/library_generation.Dockerfile +++ b/.cloudbuild/library_generation/library_generation.Dockerfile @@ -75,6 +75,9 @@ COPY --from=glibc-compat /lib/libc.* /lib/ COPY --from=glibc-compat /usr/lib/libgcc* /usr/lib/ COPY --from=glibc-compat /usr/lib/libstdc* /usr/lib/ COPY --from=glibc-compat /usr/lib/libobstack* /usr/lib/ +COPY --from=glibc-compat /lib/libm.so.6 /usr/lib/ +COPY --from=glibc-compat /usr/lib/libucontext.so.1 /usr/lib/ + # copy source code COPY hermetic_build/common /src/common