diff --git a/ucore/Containerfile b/ucore/Containerfile index b3a422e..e781370 100644 --- a/ucore/Containerfile +++ b/ucore/Containerfile @@ -37,6 +37,7 @@ COPY --from=docker.io/docker/compose-bin:latest /docker-compose /usr/bin/docker- FROM ucore-minimal AS ucore ARG COREOS_VERSION="${COREOS_VERSION:-stable}" +ARG ZFS_TAG="${ZFS_TAG}" COPY *.sh /tmp/ COPY packages.json /tmp/packages.json diff --git a/ucore/install-ucore-minimal.sh b/ucore/install-ucore-minimal.sh index ecbae46..82ed27f 100755 --- a/ucore/install-ucore-minimal.sh +++ b/ucore/install-ucore-minimal.sh @@ -16,6 +16,9 @@ for REPO in $(ls /etc/yum.repos.d/fedora-updates-testing{,-modular}.repo); do done fi +# add the ucore copr repo +curl -L https://copr.fedorainfracloud.org/coprs/ublue-os/ucore/repo/fedora/ublue-os-ucore-fedora.repo -o /etc/yum.repos.d/ublue-os-ucore-fedora.repo + # always disable cisco-open264 repo sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo @@ -28,14 +31,6 @@ rpm-ostree install /tmp/rpms/ublue-os-ucore-addons-*.rpm ## CONDITIONAL: install ZFS (and sanoid deps) if [[ "-zfs" == "${ZFS_TAG}" ]]; then rpm-ostree install /tmp/rpms/zfs/*.rpm \ - lzop \ - mbuffer \ - mhash \ - perl-Capture-Tiny \ - perl-Config-IniFiles \ - perl-Data-Dumper \ - perl-Getopt-Long \ - perl-Sys-Hostname \ pv # for some reason depmod ran automatically with zfs 2.1 but not with 2.2 depmod -A ${KERNEL} diff --git a/ucore/install-ucore.sh b/ucore/install-ucore.sh index e0060bc..ba6834e 100755 --- a/ucore/install-ucore.sh +++ b/ucore/install-ucore.sh @@ -2,6 +2,11 @@ set -ouex pipefail +## CONDITIONAL: install sanoid if ZFS +if [[ "-zfs" == "${ZFS_TAG}" ]]; then + rpm-ostree install sanoid +fi + # install packages.json stuffs export IMAGE_NAME=ucore /tmp/packages.sh