Build: Add convert-to-ami and Multi container image build

.github/workflows/_build-oci-container.yaml

@@ -94,6 +94,7 @@ jobs:
           GIT_COMMIT_HASH: ${{ github.sha }}
 
       - name: Push OCI image to registry
+        if: ${{ github.event_name == 'workflow_dispatch' }}
         run: |
           echo "::group::Push OCI image to registry:"
           make push-oci-image 

.github/workflows/_convert-to-disk.yaml

@@ -35,15 +35,20 @@ on:
         default: 'sda'
         type: string
       disk_format:
-        description: 'Type the disk format you want to convert the OCI image into (e.g. `qcow2`, `iso`, `raw`)'
+        description: 'Type the disk format you want to convert the OCI image into (e.g. `qcow2`, `iso`, `raw`, `ami`)'
         required: true
         default: 'iso'
         type: string
       rootfs:
         description: 'Type the root filesystem you want to use (e.g. `ext4`, `xfs`, `btrfs`)'
-        required: false
+        required: true
         default: 'btrfs'
         type: string
+      aws_s3_bucket:
+        description: '(Only for `ami` disk format) Type the AWS S3 bucket name you want to use'
+        required: false
+        default: 'none'
+        type: string
 
 jobs:
   convert-to-disk-image:
@@ -71,6 +76,14 @@ jobs:
           OCI_REGISTRY_PASSWORD: ${{ secrets.OCI_REGISTRY_BOT_PASSWORD }}
           OCI_REGISTRY: ${{ inputs.oci_registry }}
 
+      - name: Configure AWS credentials
+        if: ${{ inputs.disk_format == 'ami' }}
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ vars.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.AWS_REGION }}
+
       - name: Pull OCI image
         run: |
           echo "::group::Pull OCI image:"
@@ -92,7 +105,7 @@ jobs:
       - name: Convert OCI image into specified disk format
         run: |
           echo "::group::Convert OCI image into specified disk format:"
-          make convert-to-disk-image
+          make convert-to-${DISK_FORMAT}
           echo "::endgroup::"
         env:
           OCI_REGISTRY: ${{ inputs.oci_registry }}
@@ -104,7 +117,8 @@ jobs:
           DEFAULT_USER_PASSWD: ${{ secrets.DEFAULT_USER_PASSWD }}
           ROOTFS: ${{ inputs.rootfs }}
 
-      - name: Save disk format image
+      - name: Save iso format image
+        if: ${{ inputs.disk_format == 'iso' }}
         run: |
           sudo chown -R $USER:$USER ./image-builder-output
           IMAGE_DIGEST=$(docker inspect ${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG} -f json | \

Makefile

@@ -11,11 +11,16 @@ ROOTFS ?= btrfs
 ARCH ?= amd64
 BIB_CONTAINER ?= quay.io/centos-bootc/bootc-image-builder@sha256:ba8c4bee758b4b816ce0c3a605f55389412edab034918f56982e7893e0b08532
 GIT_COMMIT_HASH ?= $(shell git rev-parse HEAD)
+AWS_ACCESS_KEY_ID ?= your_aws_access_key_id
+AWS_SECRET_ACCESS_KEY ?= your_aws_secret_access_key
+AWS_AMI_NAME ?= immutable-os-bootc-$(GIT_COMMIT_HASH:0:8)
+AWS_S3_BUCKET ?= immutable-os-bootc
+AWS_REGION ?= us-east-1
 
 .PHONY: build-oci-bootc-image
 build-oci-bootc-image:
 	docker build \
-	--build-arg GIT_COMMIT_HASH=$(GIT_COMMIT_HASH) \
+	--build-arg GIT_COMMIT_HASH=${GIT_COMMIT_HASH} \
 	-t ${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG} \
 	.
 
@@ -27,35 +32,53 @@ lint-dockerfile:
 
 .PHONY: login-public-oci-registry
 login-public-oci-registry:
-	docker login -u=$(OCI_REGISTRY_USERNAME) -p=$(OCI_REGISTRY_PASSWORD) $(OCI_REGISTRY)
+	docker login -u=${OCI_REGISTRY_USERNAME} -p=${OCI_REGISTRY_PASSWORD} ${OCI_REGISTRY}
 
 .PHONY: save-image-as-tar
 save-image-as-tar:
 	docker save -o image-${GIT_COMMIT_HASH:0:8}.tar ${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}
 
 .PHONY: push-oci-image
 push-oci-image:
-	docker push $(OCI_REGISTRY)/$(OCI_IMAGE_REPO):${OCI_IMAGE_TAG}
+	docker push ${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}
 
 .PHONY: pull-oci-image
 pull-oci-image:
-	docker pull $(OCI_REGISTRY)/$(OCI_IMAGE_REPO):${OCI_IMAGE_TAG}
+	docker pull ${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}
 
 # See https://github.com/osbuild/bootc-image-builder
-.PHONY: convert-to-disk-image
-convert-to-disk-image:
+.PHONY: convert-to-iso
+convert-to-iso:
 	sudo podman load -i image-${GIT_COMMIT_HASH:0:8}.tar
 	sed -i "s|{DEFAULT_DISK}|${DEFAULT_DISK}|g" config.toml
-	sed -i "s|{DEFAULT_USER_NAME}|${DEFAULT_USER_NAME}|g" config.toml && \
-	sed -i "s|{DEFAULT_USER_PASSWD}|${DEFAULT_USER_PASSWD}|g" config.toml && \
+	sed -i "s|{DEFAULT_USER_NAME}|${DEFAULT_USER_NAME}|g" config.toml
+	sed -i "s|{DEFAULT_USER_PASSWD}|${DEFAULT_USER_PASSWD}|g" config.toml
 	sudo docker run --rm \
 	--privileged \
 	--security-opt label=type:unconfined_t \
 	-v ./image-builder-output:/output \
 	-v /var/lib/containers/storage:/var/lib/containers/storage \
 	-v ./config.toml:/config.toml:ro \
-	$(BIB_CONTAINER) \
-	--type $(DISK_FORMAT) \
+	${BIB_CONTAINER} \
+	--type ${DISK_FORMAT} \
 	--use-librepo=True \
-	--rootfs $(ROOTFS) \
-	$(OCI_REGISTRY)/$(OCI_IMAGE_REPO):${OCI_IMAGE_TAG}
+	--rootfs ${ROOTFS} \
+	${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}
+
+# See https://github.com/osbuild/bootc-image-builder?tab=readme-ov-file#amazon-machine-images-amis
+.PHONY: convert-to-ami
+convert-to-ami:
+	sudo podman load -i image-${GIT_COMMIT_HASH:0:8}.tar
+	sudo docker run --rm \
+	--privileged \
+	--security-opt label=type:unconfined_t \
+	-v /var/lib/containers/storage:/var/lib/containers/storage \
+	--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
+	--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
+	${BIB_CONTAINER} \
+	--type ${DISK_FORMAT} \
+	--rootfs ${ROOTFS} \
+	--aws-ami-name ${AWS_AMI_NAME} \
+	--aws-bucket ${AWS_S3_BUCKET} \
+	--aws-region ${AWS_REGION} \
+	${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}