diff --git a/install-dependencies.sh b/install-dependencies.sh index a26e35de05..ac60323c2f 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -211,9 +211,9 @@ if $PRINT_NODE_EXPORTER; then exit 0 fi -bash seastar/install-dependencies.sh -bash tools/jmx/install-dependencies.sh -bash tools/java/install-dependencies.sh +./seastar/install-dependencies.sh +./tools/jmx/install-dependencies.sh +./tools/java/install-dependencies.sh if [ "$ID" = "ubuntu" ] || [ "$ID" = "debian" ]; then apt-get -y install "${debian_base_packages[@]}" diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile index 9f5782d317..d32de2576e 100644 --- a/tools/toolchain/Dockerfile +++ b/tools/toolchain/Dockerfile @@ -1,12 +1,14 @@ FROM docker.io/fedora:33 ADD ./install-dependencies.sh ./ ADD ./seastar/install-dependencies.sh ./seastar/ +ADD ./tools/jmx/install-dependencies.sh ./tools/jmx/ +ADD ./tools/java/install-dependencies.sh ./tools/java/ ADD ./tools/toolchain/system-auth ./ RUN dnf -y install 'dnf-command(copr)' \ && dnf -y install ccache \ && dnf -y install gdb \ && dnf -y install devscripts debhelper fakeroot file rpm-build \ - && /bin/bash -x ./install-dependencies.sh && dnf -y update && dnf clean all \ + && ./install-dependencies.sh && dnf -y update && dnf clean all \ && echo 'ALL ALL=(ALL:ALL) NOPASSWD: ALL' >> /etc/sudoers \ && cp system-auth /etc/pam.d \ && echo 'Defaults !requiretty' >> /etc/sudoers