Skip to content

Commit

Permalink
zbm-build.sh: don't upgrade packages when installing custom software
Browse files Browse the repository at this point in the history
In cases where the `zfs` package has been updated since the container
image was built, this would trigger an upgrade of `zfs`; however, the
container does not include Linux headers by default, so the rebuild will
fail. Instead, skip the package upgrade. In the worst case, adding new
packages fails and the container image must be rebuilt.
  • Loading branch information
ahesford committed Jul 3, 2022
1 parent 10e3624 commit d4b35a0
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions releng/docker/zbm-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,11 @@ if [ -z "${ZBMTAG}" ]; then
fi

if [ "${#PACKAGES[@]}" -gt 0 ]; then
# Trigger an upgrade to make sure the package is installable
# Trigger a sync and upgrade to make sure the package is installable
xbps-install -Syu xbps
xbps-install -Syu

# Install all requested packages
xbps-install -y "${PACKAGES[@]}"
xbps-install -Sy "${PACKAGES[@]}"
fi

# shellcheck disable=SC2010
Expand Down

0 comments on commit d4b35a0

Please sign in to comment.