Prepare container image at gce_install_cuttlefish_packages

Author: 0405ysj

tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go

@@ -60,6 +60,7 @@ var (
 	image_name                          = flag.String("image-name", "", "output GCE image name")
 	deb_srcs                            = DebSrcsFlag{}
 	defaults_cuttlefish_integration_src = flag.String("defaults_cuttlefish_integration_src", "", "Path to file which will be written to /etc/defaults/cuttlefish-integration.")
+	container_image_src                 = flag.String("container-image-src", "", "local path to container image")
 )
 
 func init() {
@@ -71,6 +72,7 @@ type amendImageOpts struct {
 	SourceImage        string
 	ImageName          string
 	DebSrcs            []string
+	ContainerImageSrc  string
 }
 
 func uploadScripts(project, zone, insName string) error {
@@ -80,7 +82,8 @@ func uploadScripts(project, zone, insName string) error {
 	}{
 		{"fill_available_disk_space.sh", scripts.FillAvailableDiskSpace},
 		{"mount_attached_disk.sh", scripts.MountAttachedDisk},
-		{"install_cuttlefish_debs.sh", scripts.InstallCuttlefishPackages},
+		{"install_cuttlefish_debs.sh", scripts.InstallCuttlefishDebs},
+		{"load_cuttlefish_container_image.sh", scripts.LoadCuttlefishContainerImage},
 	}
 	for _, s := range list {
 		if err := gce.UploadBashScript(project, zone, insName, s.dstname, s.content); err != nil {
@@ -124,6 +127,17 @@ func maybeSetDefaultsCuttlefishIntegrationFile(project, zone, insName string) er
 	return nil
 }
 
+func loadCuttlefishContainerImage(project, zone, insName string, imageSrc string) error {
+	dst := "/tmp/" + filepath.Base(imageSrc)
+	if err := gce.UploadFile(project, zone, insName, imageSrc, dst); err != nil {
+		return fmt.Errorf("error uploading %s: %v", imageSrc, err)
+	}
+	if err := gce.RunCmd(project, zone, insName, "./load_cuttlefish_container_image.sh "+dst); err != nil {
+		return err
+	}
+	return nil
+}
+
 func cleanupDeleteDisk(h *gce.GceHelper, disk string) {
 	log.Printf("cleanup: deleting disk %q...", disk)
 	if err := h.DeleteDisk(disk); err != nil {
@@ -208,6 +222,10 @@ func amendImageMain(project, zone string, opts amendImageOpts) error {
 		return fmt.Errorf("couldn't set %s: %v", defaultsCuttlefishIntegrationFile, err)
 	}
 
+	if err := loadCuttlefishContainerImage(project, zone, insName, opts.ContainerImageSrc); err != nil {
+		return fmt.Errorf("install cuttlefish container error: %v", err)
+	}
+
 	// Reboot the instance to force a clean umount of the attached disk's file system.
 	if err := gce.RunCmd(project, zone, insName, "sudo reboot"); err != nil {
 		return err
@@ -252,12 +270,16 @@ func main() {
 	if len(deb_srcs.Srcs) == 0 {
 		log.Fatal("usage: `-deb` must not be empty")
 	}
+	if *container_image_src == "" {
+		log.Fatal("usage: `-container-image-src` must not be empty")
+	}
 
 	opts := amendImageOpts{
 		SourceImageProject: *source_image_project,
 		SourceImage:        *source_image,
 		ImageName:          *image_name,
 		DebSrcs:            deb_srcs.Srcs,
+		ContainerImageSrc:  *container_image_src,
 	}
 	if err := amendImageMain(*project, *zone, opts); err != nil {
 		log.Fatal(err)

tools/baseimage/pkg/gce/scripts/load_cuttlefish_container_image.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2025 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit -o nounset -o pipefail
+
+if [[ $# -eq 0 ]] ; then
+  echo "usage: $0 /path/to/container_image"
+  exit 1
+fi
+container_image=$1
+
+# Load docker image. Internally, it modifies data-root configuration of
+# /etc/docker/daemon.json to load image under default data-root location of
+# mounted attached disk. With this approach, docker installed on chroot
+# environment can recognize and use docker image when dockerd starts to run
+# on running GCE instance with GCE image created via this script.
+sudo apt install -y docker.io jq
+sudo systemctl stop docker.socket docker.service
+if [ -f /etc/docker/daemon.json ]; then
+  sudo jq '.["data-root"] = "/mnt/image/var/lib/docker"' /etc/docker/daemon.json \
+    | sudo tee /etc/docker/daemon.json > /dev/null
+else
+  sudo jq -n '.["data-root"] = "/mnt/image/var/lib/docker"' \
+    | sudo tee /etc/docker/daemon.json > /dev/null
+fi
+sudo systemctl start docker.socket docker.service
+sudo docker load --input "$container_image"
+sudo systemctl stop docker.socket docker.service
+
+sudo chroot /mnt/image /usr/bin/apt install -y docker.io

tools/baseimage/pkg/gce/scripts/scripts.go

@@ -29,7 +29,10 @@ var InstallNvidia string
 var FillAvailableDiskSpace string
 
 //go:embed install_cuttlefish_debs.sh
-var InstallCuttlefishPackages string
+var InstallCuttlefishDebs string
+
+//go:embed load_cuttlefish_container_image.sh
+var LoadCuttlefishContainerImage string
 
 //go:embed install_kernel_main.sh
 var InstallKernelMain string