Fix convert-to-ami to use DinD

Author: yureutaejin

Makefile

@@ -79,32 +79,36 @@ convert-to-iso: bib-dind-up
 				--type iso \
 				--use-librepo=True \
 				--rootfs ${ROOTFS} \
-				${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}-$${target}"; \
+			${OCI_REGISTRY}/${OCI_IMAGE_REPO}:${OCI_IMAGE_TAG}-$${target}"; \
 	done
 	$(MAKE) bib-dind-down
 
 # See https://github.com/osbuild/bootc-image-builder?tab=readme-ov-file#amazon-machine-images-amis
 .PHONY: convert-to-ami
-convert-to-ami:
+convert-to-ami: bib-dind-up
 	AWS_AMI_NAME=${SHORT_COMMIT_HASH}-core; \
-	sudo podman load -i image-${SHORT_COMMIT_HASH}-core.tar.gz; \
 	cp -rf template-ami.toml 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 /var/lib/containers/storage:/var/lib/containers/storage \
-	-v ./config.toml:/config.toml:ro \
-	--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-	--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-	${BIB_CONTAINER} \
-	--type ami \
-	--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}-core
+	docker cp config.toml bib-dind:/config.toml; \
+	docker exec bib-dind /bin/bash -c " \
+		podman load -i container-tarbells/image-${SHORT_COMMIT_HASH}-core.tar.gz; \
+		podman run --rm \
+			--privileged \
+			--security-opt label=type:unconfined_t \
+			-v /var/lib/containers/storage:/var/lib/containers/storage \
+			-v ./config.toml:/config.toml:ro \
+			-v ./filesystem/etc/selinux:/etc/selinux:ro \
+			--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
+			--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
+			${BIB_CONTAINER} \
+			--type ami \
+			--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}-core"; \
+	$(MAKE) bib-dind-down
 
 .PHONY: bib-dind-up
 bib-dind-up: