Skip to content

Commit

Permalink
chore: update base image to include tag (#3409)
Browse files Browse the repository at this point in the history
In this PR:
- Include tag in base image.

Renovate Bot can update the image sha with a fixed tag
([doc](https://docs.renovatebot.com/docker/#digest-updating)). Without
the tag, the updated image maybe not what we want.
  • Loading branch information
JoeWang1127 authored Dec 4, 2024
1 parent 1baedfe commit 86d3d8c
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions .cloudbuild/library_generation/library_generation.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
# install gapic-generator-java in a separate layer so we don't overload the image
# with the transferred source code and jars

# 3.9.9-eclipse-temurin-11-alpine
FROM docker.io/library/maven@sha256:006d25558f9d5244ed55b5d2bd8eaf34d883e447d0c4b940e67b9f44d21167bf AS ggj-build
FROM docker.io/library/maven:3.9.9-eclipse-temurin-11-alpine@sha256:006d25558f9d5244ed55b5d2bd8eaf34d883e447d0c4b940e67b9f44d21167bf AS ggj-build

WORKDIR /sdk-platform-java
COPY . .
Expand All @@ -28,8 +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"

# alpine:3.20.3
FROM docker.io/library/alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as glibc-compat
FROM docker.io/library/alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as glibc-compat

RUN apk add git sudo
# This SHA is the latest known-to-work version of this binary compatibility tool
Expand All @@ -49,8 +47,7 @@ RUN git checkout "${GLIB_MUS_SHA}"
RUN chmod a+x compile-x86_64-alpine-linux.sh
RUN sh compile-x86_64-alpine-linux.sh

# python:3.12.7-alpine3.20
FROM docker.io/library/python@sha256:5049c050bdc68575a10bcb1885baa0689b6c15152d8a56a7e399fb49f783bf98 as final
FROM docker.io/library/python:3.12.7-alpine3.20@sha256:5049c050bdc68575a10bcb1885baa0689b6c15152d8a56a7e399fb49f783bf98 as final

ARG OWLBOT_CLI_COMMITTISH=ab222d9a20bb27586433caedc70f049b7853db7e
ARG PROTOC_VERSION=25.5
Expand Down

0 comments on commit 86d3d8c

Please sign in to comment.