Skip to content

Commit

Permalink
Merge pull request containers#290 from cevich/mandown_to_go-md2man
Browse files Browse the repository at this point in the history
Install go-md2man in place of mandown
  • Loading branch information
cevich authored Aug 9, 2023
2 parents 42b2409 + d607d2a commit 755589f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230807t144831z-f38f37d13
20230809t143240z-f38f37d13
5 changes: 3 additions & 2 deletions cache_images/fedora-netavark_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ if [[ $(uname -m) == "aarch64" ]]; then
$SUDO env PATH=$PATH CARGO_HOME=$CARGO_HOME rustup target add aarch64-unknown-linux-gnu
fi

msg "Install mandown to generate man pages"
$SUDO env PATH=$PATH CARGO_HOME=$CARGO_HOME cargo install mandown
msg "Install tool to generate man pages"
$SUDO go install github.com/cpuguy83/go-md2man/v2@latest
$SUDO install /root/go/bin/go-md2man /usr/local/bin/

# Downstream users of this image are specifically testing netavark & aardvark-dns
# code changes. We want to start with using the RPMs because they deal with any
Expand Down
3 changes: 3 additions & 0 deletions cache_images/rawhide_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ $SUDO sed -i -r -e 's/^gpgcheck=.+/gpgcheck=0/' /etc/yum.repos.d/*.repo
$SUDO dnf5 -y distro-sync --releasever=rawhide --allowerasing
$SUDO dnf5 upgrade -y

# A shared fedora_packaging.sh script is called next that doesn't always support dnf5
$SUDO ln -s $(type -P dnf5) /usr/local/bin/dnf

# Packer will try to run 'cache_images/fedora_setup.sh' next, make sure the system
# is actually running rawhide (and verify it boots).
$SUDO reboot

0 comments on commit 755589f

Please sign in to comment.