Skip to content

Commit 12ba319

Browse files
authored
Merge pull request wolfSSL#7748 from bandi13/addExtraTestingTools
Need to add more dependencies to be able to run all tests
2 parents 1cf96eb + e7c068b commit 12ba319

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

Docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ USER root
66
# Set timezone to UTC
77
RUN ln -snf /usr/share/zoneinfo/UTC /etc/localtime && echo UTC > /etc/timezone
88

9-
ARG DEPS_WOLFSSL="build-essential autoconf libtool clang clang-tools zlib1g-dev libuv1-dev libpam0g-dev valgrind git linux-headers-generic gcc-multilib g++-multilib libpcap-dev bubblewrap gdb iputils-ping lldb bsdmainutils netcat binutils-arm-linux-gnueabi binutils-aarch64-linux-gnu"
9+
ARG DEPS_WOLFSSL="build-essential autoconf libtool clang clang-tools zlib1g-dev libuv1-dev libpam0g-dev valgrind git linux-headers-generic gcc-multilib g++-multilib libpcap-dev bubblewrap gdb iputils-ping lldb bsdmainutils netcat-traditional binutils-arm-linux-gnueabi binutils-aarch64-linux-gnu"
1010
ARG DEPS_LIBOQS="astyle cmake gcc ninja-build libssl-dev python3-pytest python3-pytest-xdist unzip xsltproc doxygen graphviz python3-yaml valgrind git"
1111
ARG DEPS_UDP_PROXY="wget libevent-dev"
12-
ARG DEPS_TESTS="abi-dumper libcurl4-openssl-dev tcpdump libpsl-dev python3-pandas python3-tabulate libnl-genl-3-dev libcap-ng-dev"
12+
ARG DEPS_TESTS="abi-dumper libcurl4-openssl-dev tcpdump libpsl-dev python3-pandas python3-tabulate libnl-genl-3-dev libcap-ng-dev python3-virtualenv curl jq"
1313
ARG DEPS_TOOLS="ccache clang-tidy maven"
1414
RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y apt-utils \
1515
&& apt install -y ${DEPS_WOLFSSL} ${DEPS_LIBOQS} ${DEPS_UDP_PROXY} ${DEPS_TESTS} ${DEPS_TOOLS} \

Docker/wolfCLU/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG DOCKER_BASE_IMAGE=ubuntu
22
FROM ubuntu as BUILDER
33

4-
ARG DEPS_WOLFSSL="build-essential autoconf libtool zlib1g-dev libuv1-dev libpam0g-dev git libpcap-dev libcurl4-openssl-dev bsdmainutils netcat iputils-ping bubblewrap"
4+
ARG DEPS_WOLFSSL="build-essential autoconf libtool zlib1g-dev libuv1-dev libpam0g-dev git libpcap-dev libcurl4-openssl-dev bsdmainutils netcat-traditional iputils-ping bubblewrap"
55
RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y apt-utils \
66
&& apt install -y ${DEPS_WOLFSSL} ${DEPS_LIBOQS} \
77
&& apt clean -y && rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)