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

dockerfile: install osbuild-composer-core

Browse source 
This no longer pulls in systemd/worker, saving space and makes it
suitable for use in a UBI container, where qemu-img is not available.

This drops support for --inbuilt-worker from entrypoint.py. The script
could be simplified further in a future commit, or folded into the
main binary.
This commit is contained in:
Tom Gundersen 2020-12-17 16:24:31 +01:00
parent 9fcd6a1e19
commit 21beab0617
2 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
containers/osbuild-composer/Dockerfile
View file

@ -43,7 +43,7 @@ RUN \
"--repofrompath=ephemeral0,${OSB_RPMREPO}" \ "--repofrompath=ephemeral0,${OSB_RPMREPO}" \
"--setopt=ephemeral0.gpgcheck=0" \ "--setopt=ephemeral0.gpgcheck=0" \
"--setopt=ephemeral0.priority=10" \ "--setopt=ephemeral0.priority=10" \
install "osbuild-composer" \ install "osbuild-composer-core" \
&& dnf clean all && dnf clean all
# Copy all our local sources, so we can access them from within the container # Copy all our local sources, so we can access them from within the container

14
containers/osbuild-composer/entrypoint.py
View file

@ -32,20 +32,6 @@ class Cli(contextlib.AbstractContextManager):
prog="container/osbuild-composer", prog="container/osbuild-composer",
) )
# --[no-]builtin-worker
self._parser.add_argument(
"--builtin-worker",
action="store_true",
dest="builtin_worker",
help="Enable built-in local worker",
)
self._parser.add_argument(
"--no-builtin-worker",
action="store_false",
dest="builtin_worker",
help="Disable built-in local worker",
)
# --[no-]composer-api # --[no-]composer-api
self._parser.add_argument( self._parser.add_argument(
"--composer-api", "--composer-api",