Skip to content

Commit

Permalink
feat: add ucore copr repo and install sanoid (#131)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmmcgee authored Mar 24, 2024
1 parent dc5006b commit f667c5e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions ucore/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions ucore/install-ucore-minimal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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}
Expand Down
5 changes: 5 additions & 0 deletions ucore/install-ucore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f667c5e

Please sign in to comment.