Skip to content

Commit

Permalink
zfs stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmmcgee committed Nov 17, 2024
1 parent cede6d2 commit ed568d9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
3 changes: 1 addition & 2 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ FROM ghcr.io/ublue-os/${BASE_IMAGE}:${TAG_VERSION}
ARG BASE_IMAGE="bluefin"
ARG IMAGE="bluefin"

RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=ctx,src=/,dst=/ctx \
RUN --mount=type=bind,from=ctx,src=/,dst=/ctx \
mkdir -p /var/lib/alternatives && \
/ctx/build.sh && \
mv /var/lib/alternatives /staged-alternatives && \
Expand Down
18 changes: 10 additions & 8 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -146,19 +146,21 @@ gen-build-src-dst image="" tag="" flavor="":

# Tag Version (the SOURCE tag)
if [[ "${image}" =~ ucore ]]; then
if [[ "${image}" == ucore-minimal ]]; then
if [[ "${flavor}" =~ main ]]; then
source_tag="${srctag}"
else
source_tag="${srctag}-${srcflavor}"
fi
else
## I commented these out while i decide what to do - jmcgee
# if [[ "${image}" == ucore-minimal ]]; then
# if [[ "${flavor}" =~ main ]]; then
# source_tag="${srctag}"
# else
# source_tag="${srctag}-${srcflavor}"
# fi
# else
if [[ "${flavor}" =~ main ]]; then
source_tag="${srctag}-zfs"
else
source_tag="${srctag}-${srcflavor}-zfs"
fi
fi
# fi
##
elif [[ "${image}" =~ bluefin && "${tag}" == stable ]]; then
source_tag="${srctag}-daily"
else
Expand Down

0 comments on commit ed568d9

Please sign in to comment.