Skip to content

Commit 88ab219

Browse files
author
pull clone
committed
Initialize bootc builder runtime
1 parent 233f943 commit 88ab219

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

.github/workflows/build-disk.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,14 @@ jobs:
9797
run_libpod_dir="${GITHUB_WORKSPACE}/.run/libpod"
9898
run_containers_storage_dir="${GITHUB_WORKSPACE}/.run/containers/storage"
9999
run_crun_dir="${GITHUB_WORKSPACE}/.run/crun"
100+
var_log_dir="${GITHUB_WORKSPACE}/.var_log"
100101
osbuild_store_dir="${GITHUB_WORKSPACE}/.osbuild-store"
101102
osbuild_rpmmd_dir="${GITHUB_WORKSPACE}/.osbuild-rpmmd"
102-
sudo rm -rf "${osbuild_dir}" "${var_tmp_dir}" "${graphroot}" "${run_libpod_dir}" "${run_containers_storage_dir}" "${run_crun_dir}" "${osbuild_store_dir}" "${osbuild_rpmmd_dir}"
103-
sudo mkdir -p "${osbuild_dir}" "${var_tmp_dir}" "${graphroot}" "${run_libpod_dir}" "${run_containers_storage_dir}" "${run_crun_dir}" "${osbuild_store_dir}" "${osbuild_rpmmd_dir}"
103+
sudo rm -rf "${osbuild_dir}" "${var_tmp_dir}" "${graphroot}" "${run_libpod_dir}" "${run_containers_storage_dir}" "${run_crun_dir}" "${var_log_dir}" "${osbuild_store_dir}" "${osbuild_rpmmd_dir}"
104+
sudo mkdir -p "${osbuild_dir}" "${var_tmp_dir}" "${graphroot}" "${run_libpod_dir}" "${run_containers_storage_dir}" "${run_crun_dir}" "${var_log_dir}" "${osbuild_store_dir}" "${osbuild_rpmmd_dir}"
105+
sudo touch "${var_log_dir}/hawkey.log"
106+
sudo chmod 777 "${var_log_dir}"
107+
sudo chmod 666 "${var_log_dir}/hawkey.log"
104108
sudo umount /var/lib/containers/storage || true
105109
sudo rm -rf /var/lib/containers/storage
106110
sudo mkdir -p /var/lib/containers/storage
@@ -115,6 +119,12 @@ jobs:
115119
if [[ "${{ matrix.disk-type }}" == "anaconda-iso" ]]; then
116120
config_file="./disk_config/iso.toml"
117121
fi
122+
builder_args=(/usr/bin/bootc-image-builder build --output /output --chown "${{ env.USER_UID }}:${{ env.USER_GID }}")
123+
if [[ -n "${extra_args}" ]]; then
124+
builder_args+=(${extra_args})
125+
fi
126+
builder_args+=(--type "${{ matrix.disk-type }}" "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }}")
127+
printf -v builder_cmd '%q ' "${builder_args[@]}"
118128
119129
sudo CONTAINERS_CONF="${containers_conf}" \
120130
podman pull "${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }}"
@@ -127,17 +137,20 @@ jobs:
127137
--volume "${run_libpod_dir}:/run/libpod" \
128138
--volume "${run_containers_storage_dir}:/run/containers/storage" \
129139
--volume "${run_crun_dir}:/run/crun" \
140+
--volume "${var_log_dir}:/var/log" \
130141
--volume "${osbuild_store_dir}:/store" \
131142
--volume "${osbuild_rpmmd_dir}:/rpmmd" \
132143
--volume ./output:/output \
133144
--volume "${config_file}:/config.toml:ro" \
134145
--volume "${containers_conf}:/etc/containers/containers.conf:ro" \
135-
quay.io/centos-bootc/bootc-image-builder:latest build \
136-
--output /output \
137-
--chown "${{ env.USER_UID }}:${{ env.USER_GID }}" \
138-
${extra_args} \
139-
--type "${{ matrix.disk-type }}" \
140-
"${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }}"
146+
--entrypoint /bin/sh \
147+
quay.io/centos-bootc/bootc-image-builder:latest -c "
148+
set -euo pipefail
149+
mkdir -p /run/mount
150+
touch /run/mount/utab
151+
touch /var/log/hawkey.log
152+
exec ${builder_cmd}
153+
"
141154
142155
echo "output-directory=$(pwd)/output" >> "$GITHUB_OUTPUT"
143156

0 commit comments

Comments
 (0)