From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bcmv-tmail01.ecl.ntt.co.jp (bcmv-tmail01.ecl.ntt.co.jp [124.146.185.148]) by dpdk.org (Postfix) with ESMTP id 8DF172BC7 for ; Mon, 1 Oct 2018 07:02:00 +0200 (CEST) Received: from bcmv-ns01.ecl.ntt.co.jp (bcmv-ns01.ecl.ntt.co.jp [129.60.83.123]) by bcmv-tmail01.ecl.ntt.co.jp (8.14.4/8.14.4) with ESMTP id w9151xlH020767; Mon, 1 Oct 2018 14:01:59 +0900 Received: from bcmv-ns01.ecl.ntt.co.jp (localhost [127.0.0.1]) by bcmv-ns01.ecl.ntt.co.jp (Postfix) with ESMTP id 57D0F125; Mon, 1 Oct 2018 14:01:59 +0900 (JST) Received: from localhost.localdomain (unknown [129.60.13.51]) by bcmv-ns01.ecl.ntt.co.jp (Postfix) with ESMTP id 41B7855; Mon, 1 Oct 2018 14:01:59 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp Date: Mon, 1 Oct 2018 14:01:43 +0900 Message-Id: <20181001050148.77373-4-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20181001050148.77373-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20181001050148.77373-1-ogawa.yasufumi@lab.ntt.co.jp> X-TM-AS-MML: disable Subject: [spp] [PATCH 3/8] tools/sppc: dockerfile for custom Pktgen repo X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2018 05:02:01 -0000 From: Yasufumi Ogawa This update is to change dockerfiles of Pktgen for applying the change of build script for using any of git repository. Signed-off-by: Yasufumi Ogawa --- tools/sppc/build/ubuntu/pktgen/Dockerfile.16.04 | 12 +++++++----- tools/sppc/build/ubuntu/pktgen/Dockerfile.18.04 | 12 +++++++----- tools/sppc/build/ubuntu/pktgen/Dockerfile.latest | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/sppc/build/ubuntu/pktgen/Dockerfile.16.04 b/tools/sppc/build/ubuntu/pktgen/Dockerfile.16.04 index e72dc74..dc2c503 100644 --- a/tools/sppc/build/ubuntu/pktgen/Dockerfile.16.04 +++ b/tools/sppc/build/ubuntu/pktgen/Dockerfile.16.04 @@ -7,6 +7,7 @@ ARG dpdk_repo ARG dpdk_branch ARG pktgen_repo ARG pktgen_branch +ARG pktgen_dir ENV PATH ${rte_sdk}/${rte_target}/app:${PATH} ENV http_proxy ${http_proxy} @@ -14,6 +15,7 @@ ENV https_proxy $https_proxy ENV no_proxy ${no_proxy} ENV RTE_SDK ${rte_sdk} ENV RTE_TARGET ${rte_target} +ENV PKTGEN_DIR ${pktgen_dir} RUN apt-get update && apt-get install -y \ git \ @@ -32,14 +34,14 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* WORKDIR $home_dir -RUN git clone $dpdk_branch $dpdk_repo -RUN git clone $pktgen_branch $pktgen_repo +RUN git clone ${dpdk_branch} ${dpdk_repo} +RUN git clone ${pktgen_branch} ${pktgen_repo} # Compile DPDK and pktgen -WORKDIR $rte_sdk -RUN make install T=$rte_target +WORKDIR ${rte_sdk} +RUN make install T=${rte_target} -WORKDIR ${home_dir}/pktgen-dpdk +WORKDIR ${home_dir}/${pktgen_dir} RUN make # Set working directory when container is launched diff --git a/tools/sppc/build/ubuntu/pktgen/Dockerfile.18.04 b/tools/sppc/build/ubuntu/pktgen/Dockerfile.18.04 index 6097fbc..31632e4 100644 --- a/tools/sppc/build/ubuntu/pktgen/Dockerfile.18.04 +++ b/tools/sppc/build/ubuntu/pktgen/Dockerfile.18.04 @@ -7,6 +7,7 @@ ARG dpdk_repo ARG dpdk_branch ARG pktgen_repo ARG pktgen_branch +ARG pktgen_dir ENV PATH ${rte_sdk}/${rte_target}/app:${PATH} ENV http_proxy ${http_proxy} @@ -14,6 +15,7 @@ ENV https_proxy $https_proxy ENV no_proxy ${no_proxy} ENV RTE_SDK ${rte_sdk} ENV RTE_TARGET ${rte_target} +ENV PKTGEN_DIR ${pktgen_dir} RUN apt-get update && apt-get install -y \ git \ @@ -32,14 +34,14 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* WORKDIR $home_dir -RUN git clone $dpdk_branch $dpdk_repo -RUN git clone $pktgen_branch $pktgen_repo +RUN git clone ${dpdk_branch} ${dpdk_repo} +RUN git clone ${pktgen_branch} ${pktgen_repo} # Compile DPDK and pktgen -WORKDIR $rte_sdk -RUN make install T=$rte_target +WORKDIR ${rte_sdk} +RUN make install T=${rte_target} -WORKDIR ${home_dir}/pktgen-dpdk +WORKDIR ${home_dir}/${pktgen_dir} RUN make # Set working directory when container is launched diff --git a/tools/sppc/build/ubuntu/pktgen/Dockerfile.latest b/tools/sppc/build/ubuntu/pktgen/Dockerfile.latest index ae70368..fa4b8fb 100644 --- a/tools/sppc/build/ubuntu/pktgen/Dockerfile.latest +++ b/tools/sppc/build/ubuntu/pktgen/Dockerfile.latest @@ -7,6 +7,7 @@ ARG dpdk_repo ARG dpdk_branch ARG pktgen_repo ARG pktgen_branch +ARG pktgen_dir ENV PATH ${rte_sdk}/${rte_target}/app:${PATH} ENV http_proxy ${http_proxy} @@ -14,6 +15,7 @@ ENV https_proxy $https_proxy ENV no_proxy ${no_proxy} ENV RTE_SDK ${rte_sdk} ENV RTE_TARGET ${rte_target} +ENV PKTGEN_DIR ${pktgen_dir} RUN apt-get update && apt-get install -y \ git \ @@ -32,14 +34,14 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* WORKDIR $home_dir -RUN git clone $dpdk_branch $dpdk_repo -RUN git clone $pktgen_branch $pktgen_repo +RUN git clone ${dpdk_branch} ${dpdk_repo} +RUN git clone ${pktgen_branch} ${pktgen_repo} # Compile DPDK and pktgen -WORKDIR $rte_sdk -RUN make install T=$rte_target +WORKDIR ${rte_sdk} +RUN make install T=${rte_target} -WORKDIR ${home_dir}/pktgen-dpdk +WORKDIR ${home_dir}/${pktgen_dir} RUN make # Set working directory when container is launched -- 2.7.4