From: Laszlo Gombos Date: Mon, 5 Dec 2022 23:42:37 +0000 (+0000) Subject: ci: install shfmt with dnf into openSuse container X-Git-Tag: 058~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=037eda7ce48e60e1b14b31125616f7274dfd15cc;p=thirdparty%2Fdracut.git ci: install shfmt with dnf into openSuse container Remove the special handling for shfmt binary. No need to grab a specific version of the shfm binary that is not tested together with the distribution. --- diff --git a/test/container/Dockerfile-OpenSuse-latest b/test/container/Dockerfile-OpenSuse-latest index 20259e396..9007865dd 100644 --- a/test/container/Dockerfile-OpenSuse-latest +++ b/test/container/Dockerfile-OpenSuse-latest @@ -13,11 +13,8 @@ RUN dnf -y install --setopt=install_weak_deps=False \ strace libkmod-devel gcc bzip2 xz tar wget rpm-build make git bash-completion \ sudo kernel dhcp-client qemu-kvm /usr/bin/qemu-system-$(uname -m) e2fsprogs \ tcpdump iproute iputils kbd NetworkManager btrfsprogs tgt dbus-broker \ - iscsiuio open-iscsi which ShellCheck procps pigz parted squashfs ntfsprogs \ + iscsiuio open-iscsi which ShellCheck shfmt procps pigz parted squashfs ntfsprogs \ && dnf -y remove dracut && dnf -y update && dnf clean all -RUN shfmt_version=3.2.4; wget "https://github.com/mvdan/sh/releases/download/v${shfmt_version}/shfmt_v${shfmt_version}_linux_amd64" -O /usr/local/bin/shfmt \ - && chmod +x /usr/local/bin/shfmt - # Set default command CMD ["/usr/bin/bash"]