Conversation
There was a problem hiding this comment.
Code Review
This pull request updates the base Docker images from Debian Bullseye to Bookworm (python:3.12-slim-bookworm) and replaces the deprecated google-cloud-sdk package with google-cloud-cli. It also modernizes the GPG key addition process in the GPU Dockerfile to avoid using the deprecated apt-key utility, alongside some minor formatting cleanups in Python files. Feedback on the GPU Dockerfile highlights a potential build failure if curl and gnupg are not pre-installed in the base image, suggesting they be explicitly installed before fetching the GPG key.
bbf4536 to
b10375c
Compare
b10375c to
1c8ab7d
Compare
|
Can you add how this was identified and how this fix has been verified to work |
Done |
1c8ab7d to
9d62dc4
Compare
|
Thanks for fixing the nightly build pipeline! A couple of minor suggestions and a nit for consideration / follow-up: 💡 Suggestions
🟢 Nit
|
Done |
0a3097a to
e7831c7
Compare
…le Cloud CLI - Upgrade base image to python:3.12-slim-bookworm in docker_build_dependency_image.sh and maxdiffusion_dependencies.Dockerfile - Replace retired google-cloud-sdk package with google-cloud-cli and modernize GPG keyring handling with gpg --dearmor - Consolidate APT update and install passes into a single RUN layer in maxdiffusion_dependencies.Dockerfile and maxdiffusion_gpu_dependencies.Dockerfile - Update stale comment in maxdiffusion_dependencies.Dockerfile to reference Python 3.12 - Format Wan SVG attention and AOT cache files with pyink
e7831c7 to
ff18ad0
Compare
Summary
Fixes the CPU/TPU Docker image build pipeline so that Google Cloud Build can resume publishing daily
maxdiffusion_jax_stable_stack_nightlyimages.Root Causes
python:3.12-slim-bullseye(Debian 11) package mirrors moved, breakingapt-get update.google-cloud-sdkwas retired upstream by Google Cloud apt repositories in favor ofgoogle-cloud-cli, causingapt-get install -y google-cloud-sdkto exit with code 100.Changes
BASEIMAGEdefault frompython:3.12-slim-bullseyetopython:3.12-slim-bookworm(Debian 12) inmaxdiffusion_dependencies.Dockerfileanddocker_build_dependency_image.sh.google-cloud-sdkwithgoogle-cloud-cliinmaxdiffusion_dependencies.Dockerfile, modernizing the GPG key dearmoring step.How This Was Identified
.github/workflows/build_runner.yml) was failing during the Docker build stage, halting the publication of nightly runner images (maxdiffusion_jax_stable_stack_nightly) to GCR.apt-get install -y google-cloud-sdkexited with code 100 (E: Unable to locate package google-cloud-sdk) because Google Cloud's apt repositories deprecated the package namegoogle-cloud-sdkin favor ofgoogle-cloud-cli.python:3.12-slim-bullseyebase image was hitting repository mirror archive warnings and outdated keyring handling for Google Cloud apt sources.How This Fix Has Been Verified
build-imageworkflow on this PR ran end-to-end and successfully built both CPU and TPU runner images: Workflow Run 36115942148 / Job 108009968725.bash docker_build_dependency_image.sh MODE=stable DEVICE=tpu) confirminggoogle-cloud-cliinstalls without apt errors and dependencies resolve on Debian 12 (bookworm).Some pylink formatting changes have also been done because unit tests were failing.