From: ogawa.yasufumi@lab.ntt.co.jp
To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Subject: [spp] [PATCH 2/8] tools/sppc: dockerfile for custom SPP repo
Date: Mon, 1 Oct 2018 14:01:42 +0900 [thread overview]
Message-ID: <20181001050148.77373-3-ogawa.yasufumi@lab.ntt.co.jp> (raw)
In-Reply-To: <20181001050148.77373-1-ogawa.yasufumi@lab.ntt.co.jp>
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
This update is to change dockerfiles of SPP for applying the change of
build script for using any of git repository.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
tools/sppc/build/ubuntu/spp/Dockerfile.16.04 | 12 +++++++-----
tools/sppc/build/ubuntu/spp/Dockerfile.18.04 | 12 +++++++-----
tools/sppc/build/ubuntu/spp/Dockerfile.latest | 11 ++++++-----
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/tools/sppc/build/ubuntu/spp/Dockerfile.16.04 b/tools/sppc/build/ubuntu/spp/Dockerfile.16.04
index cceb7e3..b55f056 100644
--- a/tools/sppc/build/ubuntu/spp/Dockerfile.16.04
+++ b/tools/sppc/build/ubuntu/spp/Dockerfile.16.04
@@ -7,6 +7,7 @@ ARG dpdk_repo
ARG dpdk_branch
ARG spp_repo
ARG spp_branch
+ARG spp_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 SPP_DIR ${spp_dir}
RUN apt-get update && apt-get install -y \
git \
@@ -31,14 +33,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 $spp_branch $spp_repo
+RUN git clone ${dpdk_branch} ${dpdk_repo}
+RUN git clone ${spp_branch} ${spp_repo}
# Compile DPDK and SPP
-WORKDIR $rte_sdk
-RUN make install T=$rte_target
+WORKDIR ${rte_sdk}
+RUN make install T=${rte_target}
-WORKDIR ${home_dir}/spp
+WORKDIR ${home_dir}/${spp_dir}
RUN make
# Set working directory when container is launched
diff --git a/tools/sppc/build/ubuntu/spp/Dockerfile.18.04 b/tools/sppc/build/ubuntu/spp/Dockerfile.18.04
index 51a0902..8377623 100644
--- a/tools/sppc/build/ubuntu/spp/Dockerfile.18.04
+++ b/tools/sppc/build/ubuntu/spp/Dockerfile.18.04
@@ -7,6 +7,7 @@ ARG dpdk_repo
ARG dpdk_branch
ARG spp_repo
ARG spp_branch
+ARG spp_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 SPP_DIR ${spp_dir}
RUN apt-get update && apt-get install -y \
git \
@@ -31,14 +33,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 $spp_branch $spp_repo
+RUN git clone ${dpdk_branch} ${dpdk_repo}
+RUN git clone ${spp_branch} ${spp_repo}
# Compile DPDK and SPP
-WORKDIR $rte_sdk
-RUN make install T=$rte_target
+WORKDIR ${rte_sdk}
+RUN make install T=${rte_target}
-WORKDIR ${home_dir}/spp
+WORKDIR ${home_dir}/${spp_dir}
RUN make
# Set working directory when container is launched
diff --git a/tools/sppc/build/ubuntu/spp/Dockerfile.latest b/tools/sppc/build/ubuntu/spp/Dockerfile.latest
index 3142c11..3b96080 100644
--- a/tools/sppc/build/ubuntu/spp/Dockerfile.latest
+++ b/tools/sppc/build/ubuntu/spp/Dockerfile.latest
@@ -7,6 +7,7 @@ ARG dpdk_repo
ARG dpdk_branch
ARG spp_repo
ARG spp_branch
+ARG spp_dir
ENV PATH ${rte_sdk}/${rte_target}/app:${PATH}
ENV http_proxy ${http_proxy}
@@ -31,14 +32,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 $spp_branch $spp_repo
+RUN git clone ${dpdk_branch} ${dpdk_repo}
+RUN git clone ${spp_branch} ${spp_repo}
# Compile DPDK and SPP
-WORKDIR $rte_sdk
-RUN make install T=$rte_target
+WORKDIR ${rte_sdk}
+RUN make install T=${rte_target}
-WORKDIR ${home_dir}/spp
+WORKDIR ${home_dir}/${spp_dir}
RUN make
# Set working directory when container is launched
--
2.7.4
next prev parent reply other threads:[~2018-10-01 5:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 5:01 [spp] [PATCH 0/8] Build image with custom repo name ogawa.yasufumi
2018-10-01 5:01 ` [spp] [PATCH 1/8] tools/sppc: build image with custom git repo ogawa.yasufumi
2018-10-01 5:01 ` ogawa.yasufumi [this message]
2018-10-01 5:01 ` [spp] [PATCH 3/8] tools/sppc: dockerfile for custom Pktgen repo ogawa.yasufumi
2018-10-01 5:01 ` [spp] [PATCH 4/8] tools/sppc: add paths to Dockerfiles of SPP ogawa.yasufumi
2018-10-01 5:01 ` [spp] [PATCH 5/8] tools/sppc: update app launcer for custom SPP repo ogawa.yasufumi
2018-10-01 5:01 ` [spp] [PATCH 6/8] tools/sppc: add workdir docker option ogawa.yasufumi
2018-10-01 5:01 ` [spp] [PATCH 7/8] tools/sppc: add paths to Dockerfiles of pktgen ogawa.yasufumi
2018-10-01 5:01 ` [spp] [PATCH 8/8] tools/sppc: update launcer for custom pktgen repo ogawa.yasufumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181001050148.77373-3-ogawa.yasufumi@lab.ntt.co.jp \
--to=ogawa.yasufumi@lab.ntt.co.jp \
--cc=ferruh.yigit@intel.com \
--cc=spp@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).