Skip to content

Commit

Permalink
Add lft and iperf in containers for emulation testing
Browse files Browse the repository at this point in the history
  • Loading branch information
kyechou committed Jul 31, 2024
1 parent b3ff438 commit fbeeaaf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Dockerfiles/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
klint-*/*
!klint-*/Dockerfile
linux-router/*
!linux-router/Dockerfile
!linux-router/*.sh
15 changes: 14 additions & 1 deletion Dockerfiles/linux-router/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@ LABEL org.opencontainers.image.authors="[email protected]"

COPY start.sh /start.sh

RUN apk add --upgrade --no-cache iproute2 && \
RUN apk add --upgrade --no-cache iproute2 iperf3 && \
chmod +x /start.sh

# Build lft
# http://pwhois.org/lft/
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=lft
RUN apk add --upgrade --no-cache libpcap-dev alpine-sdk gcc && \
curl -o lft-3.91.tar.gz -L http://pwhois.org/dl/index.who?file=lft-3.91.tar.gz && \
tar xf lft-3.91.tar.gz && \
cd lft-3.91 && \
./configure --prefix=/ && \
make && \
make install

RUN rm -rf /lft-3.91.tar.gz /lft-3.91

ENTRYPOINT ["/start.sh"]
2 changes: 1 addition & 1 deletion depends/neo-dev/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ url="https://github.com/netarch/neo"
license=()
depends=(base-devel curl git clang yapf elfutils libelf zlib binutils libcap
llvm glibc lib32-glibc python meson ninja python-pyelftools numactl
time python-yaml python-matplotlib python-numpy python-pandas
time libpcap python-yaml python-matplotlib python-numpy python-pandas
python-toml python-networkx gcc clang flex bison cmake ninja
python-jinja pkgconf autoconf automake libtool
zip unzip # utils required by vcpkg
Expand Down
4 changes: 2 additions & 2 deletions depends/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ main() {
style_deps=(clang yapf)
bpf_deps=(elfutils libelf zlib binutils libcap clang llvm glibc lib32-glibc)
dpdk_deps=(python meson ninja python-pyelftools numactl)
experiment_deps=(time python-yaml python-matplotlib python-numpy python-pandas python-toml python-networkx)
experiment_deps=(time libpcap python-yaml python-matplotlib python-numpy python-pandas python-toml python-networkx)
depends=("${script_deps[@]}" "${style_deps[@]}" "${bpf_deps[@]}"
"${dpdk_deps[@]}" "${experiment_deps[@]}"
gcc clang flex bison cmake ninja python-jinja pkgconf autoconf
Expand All @@ -265,7 +265,7 @@ main() {
style_deps=(clang-format yapf3)
bpf_deps=(elfutils libelf-dev zlib1g-dev binutils-dev libcap-dev clang llvm libc6-dev libc6-dev-i386)
dpdk_deps=(python3 meson ninja-build python3-pyelftools libnuma-dev)
experiment_deps=(time python3-yaml python3-matplotlib python3-numpy python3-pandas python3-toml python3-networkx)
experiment_deps=(time libpcap-dev python3-yaml python3-matplotlib python3-numpy python3-pandas python3-toml python3-networkx)
depends=("${script_deps[@]}" "${style_deps[@]}" "${bpf_deps[@]}"
"${dpdk_deps[@]}" "${experiment_deps[@]}"
gcc g++ clang clang-tools flex bison libbison-dev cmake ninja-build
Expand Down

0 comments on commit fbeeaaf

Please sign in to comment.