Merge pull request #88 from slagle/user-packages

Add $USER_PACKAGES to bootc image

Author: slagle

bootc/Containerfile

@@ -112,6 +112,8 @@ ARG NVMEOF_PACKAGES="\
     nvme-cli \
     "
 
+ARG USER_PACKAGES=""
+
 ARG RHSM_SCRIPT=empty.sh
 COPY $RHSM_SCRIPT /var/tmp/rhsm-script.sh
 RUN /var/tmp/rhsm-script.sh && \
@@ -131,7 +133,9 @@ RUN /var/tmp/rhsm-script.sh && \
         $REBOOT_PACKAGES \
         $SSHD_PACKAGES \
         $TUNED_PACKAGES \
-        $TELEMETRY_LOGGING_PACKAGES && \
+        $TELEMETRY_LOGGING_PACKAGES \
+        $USER_PACKAGES \
+        && \
     # edpm_bootstrap
     source /etc/os-release && if [ "${ID}" = "rhel" ]; then dnf -y install rhoso-release; fi && \
     # edpm_kernel

bootc/Makefile

@@ -7,6 +7,7 @@ EDPM_BOOTC_IMAGE ?= ${EDPM_BOOTC_REPO}:${EDPM_BOOTC_TAG}
 EDPM_QCOW2_IMAGE ?= ${EDPM_BOOTC_REPO}:${EDPM_BOOTC_TAG}-qcow2
 BUILDER_IMAGE ?= quay.io/centos-bootc/bootc-image-builder:latest
 HOST_PACKAGES ?= podman osbuild-selinux https://download.devel.redhat.com/rcm-guest/puddles/OpenStack/rhos-release/rhos-release-latest.noarch.rpm
+USER_PACKAGES ?=
 RHSM_SCRIPT ?= empty.sh
 FIPS ?= 1
 
@@ -35,6 +36,7 @@ build: output/yum.repos.d
 		--build-arg EDPM_BASE_IMAGE=${EDPM_BASE_IMAGE} \
 		--build-arg RHSM_SCRIPT=${RHSM_SCRIPT} \
 		--build-arg FIPS=${FIPS} \
+		--build-arg USER_PACKAGES=${USER_PACKAGES} \
 		--volume /etc/pki/ca-trust:/etc/pki/ca-trust:ro,Z \
 		--volume $(shell pwd)/output/yum.repos.d:/etc/yum.repos.d:rw,Z \
 		-f ${EDPM_CONTAINERFILE} \