Skip to content

Commit d4b35a0

Browse files
committed
zbm-build.sh: don't upgrade packages when installing custom software
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.
1 parent 10e3624 commit d4b35a0

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

releng/docker/zbm-build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,11 @@ if [ -z "${ZBMTAG}" ]; then
123123
fi
124124

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

130129
# Install all requested packages
131-
xbps-install -y "${PACKAGES[@]}"
130+
xbps-install -Sy "${PACKAGES[@]}"
132131
fi
133132

134133
# shellcheck disable=SC2010

0 commit comments

Comments
 (0)