diff options
| author |   mbeierl <mark.beierl@dell.com> | 2017-08-02 15:25:00 -0400 |
|---|---|---|
| committer | mbeierl <mark.beierl@dell.com> | 2017-08-02 21:34:39 -0400 |
| commit | 49346dc735962a35ab27d2059d3f8fd541390533 (patch) | |
| tree | 92664bfe64201b02eaa6ab450fe7e7c1d1f23324 /docker/storperf-master/Dockerfile | |
| parent | 37e7b924e4e994b6e5bf14e755746e435dbec3ec (diff) | |
Update FIO version
Updates FIO to 2.99, and changes metric from 'lat' to
'lat_ns'.
Change-Id: Ib46cc2fe10c7b7577ee0eaa9cb4805e0dda4bde2
JIRA: STORPERF-197
Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'docker/storperf-master/Dockerfile')
| -rw-r--r-- | docker/storperf-master/Dockerfile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile index a70e21e..b19c12d 100644 --- a/docker/storperf-master/Dockerfile +++ b/docker/storperf-master/Dockerfile @@ -15,7 +15,7 @@ # $ docker build -t opnfv/storperf-master:tag . # -FROM alpine:3.5 as fio-builder +FROM alpine:3.5 as storperf-builder LABEL version="5.0" description="OPNFV Storperf Docker container" @@ -24,7 +24,6 @@ ARG BRANCH=master ENV repos_dir /home/opnfv/repos RUN apk --no-cache add --update \ - python-dev \ git \ alpine-sdk \ linux-headers \ @@ -33,15 +32,12 @@ RUN apk --no-cache add --update \ zlib-dev # Third party git fetches - RUN git config --global http.sslVerify false RUN git clone http://git.kernel.dk/fio.git ${repos_dir}/fio -RUN cd ${repos_dir}/fio && git checkout tags/fio-2.2.10 +RUN cd ${repos_dir}/fio && git checkout tags/fio-2.99 RUN cd ${repos_dir}/fio && EXTFLAGS="-static" make install -# StorPerf Master Builder - -FROM alpine:3.5 as storperf-builder +# Build StorPerf RUN apk --no-cache add --update \ libffi-dev \ @@ -68,7 +64,7 @@ RUN apk --no-cache add --update \ bash COPY --from=storperf-builder /usr/lib/python2.7/site-packages /usr/lib/python2.7/site-packages -COPY --from=fio-builder /usr/local/bin/fio /usr/local/bin/fio +COPY --from=storperf-builder /usr/local/bin/fio /usr/local/bin/fio COPY . /storperf WORKDIR /storperf |