Merge osbuild-ci Fedora and cXs Containerfiles

Use a single Containerfile for building all osbuild-ci containers, regardless of the distro. Signed-off-by: Tomáš Hozza <[email protected]>
osbuild · Sep 17, 2024 · 812ef22 · 812ef22
1 parent e267156
commit 812ef22
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 65 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -406,7 +406,7 @@ target "virtual-osbuild-ci-cXs" {
                 ]),
                 OSB_DNF_ALLOW_ERASING = 1,
         }
-        dockerfile = "src/images/osbuild-ci-cstream.Dockerfile"
+        dockerfile = "src/images/osbuild-ci.Dockerfile"
         inherits = [
                 "virtual-osbuild-ci-base",
         ]

diff --git a/src/images/osbuild-ci-cstream.Dockerfile b/src/images/osbuild-ci-cstream.Dockerfile
diff --git a/src/images/osbuild-ci.Dockerfile b/src/images/osbuild-ci.Dockerfile
@@ -18,6 +18,10 @@
 #       Specify the package groups to install into the container. Separate
 #       groups by comma. By default, no group is pulled in.
 #
+#   * OSB_PIP_PACKAGES=""
+#       Specify the packages to install into the container using pip. Separate
+#       packages by comma. By default, no packages are installed.
+#
 
 ARG             OSB_FROM="docker.io/library/fedora:latest"
 FROM            "${OSB_FROM}" AS target
@@ -32,7 +36,10 @@ COPY            src src
 
 ARG             OSB_DNF_PACKAGES=""
 ARG             OSB_DNF_GROUPS=""
-RUN             ./src/scripts/dnf.sh "${OSB_DNF_PACKAGES}" "${OSB_DNF_GROUPS}"
+ARG             OSB_PIP_PACKAGES=""
+ARG             OSB_DNF_ALLOW_ERASING=""
+RUN             ./src/scripts/dnf.sh "${OSB_DNF_PACKAGES}" "${OSB_DNF_GROUPS}" ${OSB_DNF_ALLOW_ERASING}
+RUN             ./src/scripts/pip.sh "${OSB_PIP_PACKAGES}"
 COPY            src/scripts/osbuild-ci.sh .
 
 RUN             rm -rf /osb/src