diff options
| author |   Mark Beierl <mbeierl@vmware.com> | 2019-12-16 16:37:36 -0500 |
|---|---|---|
| committer | Mark Beierl <mbeierl@vmware.com> | 2019-12-17 11:35:36 -0500 |
| commit | 8d97778672f843cd79ac9862b5fe8c13ef31091f (patch) | |
| tree | ade1e84445a7341ca72c48e05f343045a0e1b26d /docker/storperf-master/Dockerfile | |
| parent | ddc5a2888edf717ff074c272b01a6310e0d612fa (diff) | |
Update to Python3
Updates to make StorPerf Python3 compatible, including pulling
in SNAPS-OO as python3.
Change-Id: Ie4e7af684bd5a1b8db086893848b1889da6308ba
JIRA: STORPERF-268
Signed-off-by: Mark Beierl <mbeierl@vmware.com>
Diffstat (limited to 'docker/storperf-master/Dockerfile')
| -rw-r--r-- | docker/storperf-master/Dockerfile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/docker/storperf-master/Dockerfile b/docker/storperf-master/Dockerfile index 9764a8d..a2e1a1d 100644 --- a/docker/storperf-master/Dockerfile +++ b/docker/storperf-master/Dockerfile @@ -16,12 +16,12 @@ # ARG ARCH=x86_64 -ARG ALPINE_VERSION=v3.6 +ARG ALPINE_VERSION=v3.10 FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-builder RUN ulimit -n 1024 -LABEL version="7.0" description="OPNFV Storperf Docker container" +LABEL version="8.0" description="OPNFV Storperf Docker container" ARG BRANCH=master @@ -47,28 +47,27 @@ RUN cd ${repos_dir}/fio && EXTFLAGS="-static" make -j $(grep -c ^processor /proc RUN apk --no-cache add --update \ libffi-dev \ libressl-dev \ - python \ - py-pip \ - python-dev \ + python3=3.7.5-r1 \ + python3-dev=3.7.5-r1 \ alpine-sdk \ - linux-headers \ - bash + linux-headers # Install StorPerf COPY requirements.pip /storperf/ -RUN pip install --upgrade setuptools==33.1.1 -RUN pip install -r /storperf/requirements.pip +RUN python3 -m pip install --upgrade setuptools==33.1.1 +RUN python3 -m pip install -r /storperf/requirements.pip # Build stripped down StorPerf image FROM multiarch/alpine:$ARCH-$ALPINE_VERSION as storperf-master RUN apk --no-cache add --update \ - python \ + libressl-dev \ + python3=3.7.5-r1 \ bash -COPY --from=storperf-builder /usr/lib/python2.7/site-packages /usr/lib/python2.7/site-packages +COPY --from=storperf-builder /usr/lib/python3.7/site-packages /usr/lib/python3.7/site-packages COPY --from=storperf-builder /usr/local/bin/fio /usr/local/bin/fio COPY . /storperf @@ -80,4 +79,4 @@ RUN chmod 600 storperf/resources/ssh/storperf_rsa EXPOSE 5000 # Entry point -CMD [ "python", "./rest_server.py" ] +CMD [ "python3", "./rest_server.py" ] |