tools/toolchain: stop ignoring error on install-dependencies.sh, run jmx/java script correctly
We should run install-dependencies.sh with -e option to prevent ignoring error in the script. Also, need to add tools/jmx/install-dependencies.sh and tools/java/install-dependencies.sh, to fix 'No such file or directory' error on them. Fixes #8293 Closes #8294 [avi: did not regenerate toolchain image, since no new packages are installed]
This commit is contained in:
committed by
Piotr Sarna
parent
b91d6776a0
commit
0424a41e30
@@ -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[@]}"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user