particle-os/debian-forge-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ibcli: use /var/cache/image-builder/store as default for --store

Browse source 
This commit follows a suggestion from Ondrej to add a better
default for `--store`: /var/cache/image-builder/store.

This is nice as it will give users automatic caching and makes
the container also nicer.
This commit is contained in:
Michael Vogt 2024-12-19 10:17:59 +01:00 • committed by Ondřej Budai
parent 083c220f0a
commit f89342a1bd
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containerfile
View file

@ -49,7 +49,7 @@ ENTRYPOINT ["/entrypoint.sh"]
VOLUME /output VOLUME /output
WORKDIR /output WORKDIR /output
# XXX: add "store" flag like bib # XXX: add "store" flag like bib
VOLUME /store VOLUME /var/cache/image-builder/store
VOLUME /var/lib/containers/storage VOLUME /var/lib/containers/storage
LABEL description="This tools allows to build and deploy disk-images." LABEL description="This tools allows to build and deploy disk-images."

3
cmd/image-builder/main.go
View file

@ -158,7 +158,8 @@ operating sytsems like centos and RHEL with easy customizations support.`,
Args: cobra.RangeArgs(1, 2), Args: cobra.RangeArgs(1, 2),
} }
buildCmd.Flags().AddFlagSet(manifestCmd.Flags()) buildCmd.Flags().AddFlagSet(manifestCmd.Flags())
buildCmd.Flags().String("store", ".store", `osbuild store directory to cache intermediata build artifacts"`) // XXX: add --rpmmd cache too and put under /var/cache/image-builder/dnf
buildCmd.Flags().String("store", "/var/cache/image-builder/store", `osbuild store directory to cache intermediata build artifacts"`)
rootCmd.AddCommand(buildCmd) rootCmd.AddCommand(buildCmd)
return rootCmd.Execute() return rootCmd.Execute()

3
entrypoint.sh
View file

@ -6,7 +6,6 @@ set -e
# see https://github.com/teamsbc/container-for-osbuild/blob/main/entrypoint.bash (thanks simon) # see https://github.com/teamsbc/container-for-osbuild/blob/main/entrypoint.bash (thanks simon)
# and https://github.com/osbuild/bootc-image-builder/blob/main/bib/internal/setup/setup.go#L21 (thanks ondrej,achilleas,colin) # and https://github.com/osbuild/bootc-image-builder/blob/main/bib/internal/setup/setup.go#L21 (thanks ondrej,achilleas,colin)
mkdir /run/osbuild mkdir /run/osbuild
mkdir /run/osbuild-store
mount -t tmpfs tmpfs /run/osbuild mount -t tmpfs tmpfs /run/osbuild
@ -19,4 +18,4 @@ mount --bind /run/osbuild/osbuild /usr/bin/osbuild
# XXX: make this nicer # XXX: make this nicer
cd /output cd /output
/usr/bin/image-builder --store=/store "$@" /usr/bin/image-builder "$@"