Skip to content

Commit

Permalink
Include cryptsetup in containarized builds
Browse files Browse the repository at this point in the history
Closes #291
  • Loading branch information
gorbak25 authored and zdykstra committed Apr 26, 2022
1 parent fd52d7c commit f1b0270
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion releng/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN echo "ignorepkg=linux" > /etc/xbps.d/10-nolinux.conf \
# Install components necessary to build the image
RUN xbps-query -Rp run_depends zfsbootmenu | xargs xbps-install -y
RUN xbps-install -y linux5.10 linux5.10-headers \
zfs gummiboot-efistub curl yq-go bash kbd terminus-font dracut mkinitcpio
zfs gummiboot-efistub curl yq-go bash kbd terminus-font dracut mkinitcpio cryptsetup

# Remove headers and massive dkms development toolchain; binutils
# provides objcopy, which is necessary for UEFI bundle creation
Expand Down
2 changes: 1 addition & 1 deletion releng/docker/image-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ buildah run "${container}" \
buildah run "${container}" xbps-install -y \
linux5.10 linux5.10-headers gummiboot-efistub curl yq-go bash kbd terminus-font \
dracut mkinitcpio dracut-network gptfdisk iproute2 iputils parted curl \
dosfstools e2fsprogs efibootmgr
dosfstools e2fsprogs efibootmgr cryptsetup

# Remove headers and development toolchain, but keep binutils for objcopy
buildah run "${container}" sh -c 'echo "ignorepkg=dkms" > /etc/xbps.d/10-nodkms.conf'
Expand Down

0 comments on commit f1b0270

Please sign in to comment.