diff options
| author |   Sridhar K. N. Rao <sridhar.rao@spirent.com> | 2021-11-22 18:07:01 +0530 |
|---|---|---|
| committer | Sridhar K. N. Rao <sridhar.rao@spirent.com> | 2021-11-22 18:08:41 +0530 |
| commit | 01e5b8c6ee5ec743962301b1337219b5e3850ab5 (patch) | |
| tree | af4c75a359ab9a2030f5d7c2f05da4ea3cee25a9 | |
| parent | 24e68cf441d94ba09a13f21fdfc994d4a14dfde0 (diff) | |
TOOLS: Fix bugs in container builds.
There are bugs in l2l3fwd and pktgen dockerfiles.
This patch fixes it.
Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Change-Id: I15cfb74d2bf26fbe9e7c2c9b147764fa7cec24c8
| -rw-r--r-- | tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd/Dockerfile | 1 | ||||
| -rw-r--r-- | tools/docker/test-containers/trafficgen-pods/pktgen/Dockerfile | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd/Dockerfile b/tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd/Dockerfile index c56e45cf..4bf4a0a9 100644 --- a/tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd/Dockerfile +++ b/tools/docker/test-containers/dpdk-forwarding-pods/l2l3fwd/Dockerfile @@ -77,7 +77,6 @@ FROM centos COPY --from=0 /usr/bin/dpdk-app /usr/bin/dpdk-app COPY --from=0 /usr/bin/l2fwd /usr/bin/l2fwd COPY --from=0 /usr/bin/l3fwd /usr/bin/l3fwd -COPY --from=0 /usr/bin/testpmd /usr/bin/testpmd COPY --from=0 /lib64/libnetutil_api.so /lib64/libnetutil_api.so COPY --from=0 /usr/lib64/libnuma.so.1 /usr/lib64/libnuma.so.1 COPY --from=0 /root/go/src/github.com/openshift/app-netutil/bin/c_sample /usr/bin/c_sample diff --git a/tools/docker/test-containers/trafficgen-pods/pktgen/Dockerfile b/tools/docker/test-containers/trafficgen-pods/pktgen/Dockerfile index 8288cf63..44bed3e2 100644 --- a/tools/docker/test-containers/trafficgen-pods/pktgen/Dockerfile +++ b/tools/docker/test-containers/trafficgen-pods/pktgen/Dockerfile @@ -13,7 +13,7 @@ RUN yum install -y pciutils iproute; yum clean all ## Download and Build APP-NetUtil ## WORKDIR /root/go/src/ -RUN go get github.com/openshift/app-netutil 2>&1 > /tmp/UserspaceDockerBuild.log || echo "Can ignore no GO files." +RUN mkdir github.com && cd github.com && mkdir openshift && cd openshift && git clone https://github.com/openshift/app-netutil WORKDIR /root/go/src/github.com/openshift/app-netutil RUN make c_sample RUN cp bin/libnetutil_api.so /lib64/libnetutil_api.so; cp bin/libnetutil_api.h /usr/include/libnetutil_api.h |