From fdfbd3f5a893ee05f41d64c9c862e77c8a6bd25e Mon Sep 17 00:00:00 2001 From: Seungjae Yoo Date: Mon, 12 Jan 2026 16:15:38 +0900 Subject: [PATCH] Container image based on Google-provided image --- .github/workflows/presubmit.yaml | 8 ++++++++ container/Containerfile | 2 +- container/image-builder.sh | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml index 25bfec490ca..0c10010c511 100644 --- a/.github/workflows/presubmit.yaml +++ b/.github/workflows/presubmit.yaml @@ -239,6 +239,10 @@ jobs: - name: Build docker image shell: bash run: | + sudo apt install -y skopeo + skopeo copy \ + docker://marketplace.gcr.io/google/debian12:latest \ + docker-daemon:marketplace.gcr.io/google/debian12:latest tar -xvf debs_amd64.tar container/image-builder.sh -m dev - name: Save docker image @@ -261,6 +265,10 @@ jobs: - name: Build docker image shell: bash run: | + sudo apt install -y skopeo + skopeo copy \ + docker://marketplace.gcr.io/google/debian12:latest \ + docker-daemon:marketplace.gcr.io/google/debian12:latest tar -xvf debs_arm64.tar container/image-builder.sh -m dev - name: Save docker image diff --git a/container/Containerfile b/container/Containerfile index 23a1baf8496..fc8c7c3df78 100644 --- a/container/Containerfile +++ b/container/Containerfile @@ -5,7 +5,7 @@ ARG BUILD_OPTION=prod -FROM debian:12 AS runner-base +FROM marketplace.gcr.io/google/debian12:latest AS runner-base # Expose Operator Port (HTTP:1080, HTTPS:1443) EXPOSE 1080 1443 diff --git a/container/image-builder.sh b/container/image-builder.sh index 4065f991ef8..7bcab9d0645 100755 --- a/container/image-builder.sh +++ b/container/image-builder.sh @@ -85,6 +85,8 @@ case "${container_type}" in exit 1 esac +"${container_type}" pull "marketplace.gcr.io/google/debian12:latest" + pushd $android_cuttlefish_root_dir "${container_type}" build \ --force-rm \