container/image-builder.sh supports to build podman image

Author: 0405ysj

README.md

@@ -73,7 +73,7 @@ The following script can be used to build a host image for Google Compute Engine
 [Check out the AOSP tree](https://source.android.com/setup/build/downloading)
 to obtain the script.
 
-## Docker
+## Container images
 
-Please read [container/README.md](container/README.md) to know how to use docker image
-containing Cuttlefish debian packages.
+Please read [container/README.md](container/README.md) to know how to build and
+use docker or podman image containing Cuttlefish debian packages.

container/Containerfile

@@ -1,5 +1,5 @@
-# Docker image for running CF instances in the server.
-# Docker image includes HO(Host Orchestrator) inside,
+# Container image for running CF instances in the server.
+# Container image includes HO(Host Orchestrator) inside,
 # so it could execute CF instance with API in HO.
 
 ARG BUILD_OPTION=prod

container/README.md

@@ -1,6 +1,6 @@
-# Docker
+# Container images
 
-We provide docker images with installed cuttlefish debian packages inside;
+We provide container images with installed cuttlefish debian packages inside;
 including `cuttlefish-base`, `cuttlefish-user`, and `cuttlefish-orchestration`.
 Currently it's available for x86_64 and ARM64 architectures.
 
@@ -18,19 +18,21 @@ docker pull us-docker.pkg.dev/android-cuttlefish-artifacts/cuttlefish-orchestrat
 Please refer to
 [Cloud Orchestrator documentation for on-premise server](https://github.com/google/cloud-android-orchestration/blob/main/scripts/on-premises/single-server/README.md).
 
-## Build docker image manually
+## Build container image manually
 
-To build docker image, building host debian packages for docker image is
-required. Please refer to
+To build container image, building host debian packages is required in
+advance.
+Please refer to
 [tools/buildutils/cw/README.md](../tools/buildutils/cw/README.md) for building
 host debian packages including `base` and `frontend`.
 
-After retrieving host debian packages, please run below command to build
-manually.
+### Docker
+
+Please run below command to build docker image manually.
 
 ```bash
 cd /path/to/android-cuttlefish
-container/image-builder.sh -m dev
+container/image-builder.sh -m dev -c docker
 ```
 
 You can validate if the docker image is successfully built by checking
@@ -41,3 +43,21 @@ REPOSITORY               TAG    IMAGE ID       CREATED          SIZE
 cuttlefish-orchestration latest 0123456789ab   2 minutes ago    690MB
 ...
 ```
+
+### Podman
+
+Please run below command to build podman image manually.
+
+```bash
+cd /path/to/android-cuttlefish
+sudo container/image-builder.sh -m dev -c podman
+```
+
+You can validate if the podman image is successfully built by checking
+`cuttlefish-orchestration` in `sudo podman image list` like below.
+```
+$ sudo podman image list
+REPOSITORY                            TAG                IMAGE ID      CREATED         SIZE
+localhost/cuttlefish-orchestration    latest             b5870005843b  39 minutes ago  1.12 GB
+...
+```

container/image-builder.sh

@@ -1,30 +1,36 @@
 #!/usr/bin/env bash
 
-# This shell script exists for building docker image.
-# Docker image includes HO(Host Orchestrator) inside,
+# This shell script exists for building container images.
+# Container image includes HO(Host Orchestrator) inside,
 # so it could execute CF instance with API in HO.
 
 script_location=`realpath -s $(dirname ${BASH_SOURCE[0]})`
 android_cuttlefish_root_dir=$(realpath -s $script_location/..)
 
 usage() {
-  echo "usage: $0 [-t <tag>] [-m <mode>]"
-  echo "  -t: name or name:tag of docker image (default cuttlefish-orchestration)"
+  echo "usage: $0 [-t <tag>] [-m <mode>] [-c <container_type>]"
+  echo "  -t: name or name:tag of container image (default: cuttlefish-orchestration)"
   echo "  -m: set mode for build image (default: stable)"
   echo "      stable   - Downloads and installs host packages from stable channel"
   echo "      unstable - Downloads and installs host packages from unstable channel"
   echo "      nightly  - Downloads and installs host packages from nightly channel"
   echo "      dev      - Use *.deb files under repo dir as prebuilt of host packages"
+  echo "  -c: type of container (default: docker)"
+  echo "      Available container type: docker, podman"
 }
 
 name=cuttlefish-orchestration
 mode=stable
-while getopts ":hm:t:" opt; do
+container_type=docker
+while getopts ":hm:t:c:" opt; do
   case "${opt}" in
     h)
       usage
       exit 0
       ;;
+    c)
+      container_type="${OPTARG}"
+      ;;
     m)
       mode="${OPTARG}"
       ;;
@@ -67,15 +73,26 @@ case "${mode}" in
     exit 1
 esac
 
-# Build docker image
+case "${container_type}" in
+  docker)
+    DOCKER_BUILDKIT=1
+    ;;
+  podman)
+    ;;
+  *)
+    echo "Invalid container type: ${container type}" >&2
+    usage
+    exit 1
+esac
+
 pushd $android_cuttlefish_root_dir
-DOCKER_BUILDKIT=1 docker build \
-    --force-rm \
-    --no-cache \
-    -f container/Containerfile \
-    -t $name \
-    --target runner \
-    --build-arg BUILD_OPTION=$build_option \
-    --build-arg REPO=$repo \
-    .
+"${container_type}" build \
+  --force-rm \
+  --no-cache \
+  -f container/Containerfile \
+  -t "${name}" \
+  --target runner \
+  --build-arg "BUILD_OPTION=${build_option}" \
+  --build-arg "REPO=${repo}" \
+  .
 popd