Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add ucore copr repo and install sanoid #131

Merged
merged 5 commits into from
Mar 24, 2024
Merged

feat: add ucore copr repo and install sanoid #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b94a52
feat: add ucore corp repo and install sanoid
johnmmcgee Mar 17, 2024
24e90aa
remove sanoid deps from minimal. fix zfs_tag arg in containerfile
johnmmcgee Mar 18, 2024
cd826d5
remove trailing space
johnmmcgee Mar 18, 2024
53da451
remove perl-sys-hostname and readd pv
johnmmcgee Mar 18, 2024
5eb7c96
Merge branch 'main' into sanoid
johnmmcgee Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ucore/Containerfile
View file
Open in desktop
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
View file
Open in desktop
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
bsherman marked this conversation as resolved.
Show resolved Hide resolved
# 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
View file
Open in desktop
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