diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2021-02-04 09:12:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-02-04 09:12:26 +0000 |
| commit | 462f05e61da3d38356c01f8c90aa0bc837c3582d (patch) | |
| tree | c7df703b7e5da83ea2e47e8d9b16245af85ae6cc /docker | |
| parent | 7937f07593e81b8a42f787d06c0f3c0797642bc4 (diff) | |
| parent | f86199579c45c2eac2d6f3ddd1a72a26b35fcbfa (diff) | |
Merge "Add packages to docker image builder"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/scripts/build_executor_docker_image.sh | 2 | ||||
| -rw-r--r-- | docker/scripts/lib_apt.sh | 3 | ||||
| -rw-r--r-- | docker/scripts/lib_dnf.sh | 7 | ||||
| -rw-r--r-- | docker/scripts/lib_yum.sh | 3 |
4 files changed, 13 insertions, 2 deletions
diff --git a/docker/scripts/build_executor_docker_image.sh b/docker/scripts/build_executor_docker_image.sh index d0af78be3..2eac97df7 100755 --- a/docker/scripts/build_executor_docker_image.sh +++ b/docker/scripts/build_executor_docker_image.sh @@ -143,3 +143,5 @@ for executor_os_name in $os_names ; do fi fi done + +echo -e "\n$(basename $BASH_SOURCE) COMPLETE!\nHave a great day! :D" diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index b0bc4bc96..449b008e7 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -140,6 +140,7 @@ ENV PATH=$PATH:$DOCKER_CIMAN_ROOT/docker/scripts # liblapack-dev for python numpy/scipy (CSIT/aarch64) # libopenblas-dev for python numpy/scipy (CSIT/aarch64) # libpcap-dev for python pypcap install (CSIT) +# sshpass for CSIT jobs # RUN apt-get update -q \\ && apt-get install -y -qq \\ @@ -151,6 +152,7 @@ RUN apt-get update -q \\ emacs \\ facter \\ gawk \\ + gdb \\ gfortran \\ git \\ git-review \\ @@ -172,6 +174,7 @@ RUN apt-get update -q \\ python3-venv \\ rsync \\ ruby-dev \\ + sshpass \\ sudo \\ traceroute \\ tree \\ diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh index e5948fbda..e3fd768af 100644 --- a/docker/scripts/lib_dnf.sh +++ b/docker/scripts/lib_dnf.sh @@ -101,8 +101,9 @@ COPY . . # enchant for 'make docs' (VPP) # libffi-devel for python cffi install (Ubuntu20.04/VPP/aarch64) # libpcap-devel for python pypcap install (CSIT) -# lapack-devel for python numpy/scipy (CSIT/aarch64) -# openblas-devel for python numpy/scipy (CSIT/aarch64) +# lapack-devel for python numpy/scipy (CSIT/aarch64) +# openblas-devel for python numpy/scipy (CSIT/aarch64) +# sshpass for CSIT # RUN export LC_ALL=C.UTF8 \\ && dnf update -y \\ @@ -120,6 +121,7 @@ RUN export LC_ALL=C.UTF8 \\ enchant \\ emacs \\ facter \\ + gdb \\ git \\ git-review \\ graphviz \\ @@ -142,6 +144,7 @@ RUN export LC_ALL=C.UTF8 \\ rake \\ rsync \\ ruby-devel \\ + sshpass \\ sudo \\ tree \\ unzip \\ diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh index 58ad38f64..d4da28972 100644 --- a/docker/scripts/lib_yum.sh +++ b/docker/scripts/lib_yum.sh @@ -96,6 +96,7 @@ COPY . . # libpcap-devel for python pypcap install (CSIT) # liblapack-devel for python numpy/scipy (CSIT/aarch64) # libopenblas-devel for python numpy/scipy (CSIT/aarch64) +# sshpass for CSIT # RUN yum update -y \\ && yum install -y \\ @@ -109,6 +110,7 @@ RUN yum update -y \\ enchant \\ emacs \\ facter \\ + gdb \\ git \\ git-review \\ graphviz \\ @@ -130,6 +132,7 @@ RUN yum update -y \\ python3-pip \\ rake \\ ruby-devel \\ + sshpass \\ sudo \\ tree \\ unzip \\ |