summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile12
-rw-r--r--docker/Dockerfile.aarch64.patch12
-rw-r--r--docker/Dockerfile.centos78
3 files changed, 17 insertions, 15 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 56ca1ea2..6d6a7db7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,14 +25,16 @@ RUN \
libssl-dev \
libffi-dev \
vim \
- python-dev \
- python-pip \
+ python3-dev \
+ python3-pip \
--no-install-recommends \
&& \
rm -rf /var/lib/apt/lists/*
-RUN pip install -U setuptools wheel
+RUN pip3 install -U setuptools wheel
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
ENV HOME /home/opnfv
ENV REPOS_DIR ${HOME}/dovetail
ENV API_DIR ${REPOS_DIR}/dovetail/api
@@ -46,11 +48,11 @@ RUN \
(cd /tmp/dovetail && \
git fetch --tags https://gerrit.opnfv.org/gerrit/dovetail $BRANCH && \
git checkout FETCH_HEAD && \
- pip install .) \
+ pip3 install .) \
&& \
rm -rf /tmp/dovetail \
&& \
- ln -s /usr/local/lib/python2.7/dist-packages/dovetail ${REPOS_DIR}/dovetail
+ ln -s /usr/local/lib/python3.6/dist-packages/dovetail ${REPOS_DIR}/dovetail
RUN \
git clone https://github.com/swagger-api/swagger-ui.git \
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch
index 68f002c0..ecde81f1 100644
--- a/docker/Dockerfile.aarch64.patch
+++ b/docker/Dockerfile.aarch64.patch
@@ -32,9 +32,9 @@ index c5239db..b4fd9f7 100644
RUN \
apt-get update \
@@ -17,21 +25,11 @@ RUN \
- python-dev \
- python-mock \
- python-pip \
+ python3-dev \
+ python3-mock \
+ python3-pip \
- apt-transport-https \
wget \
+ sudo \
@@ -59,10 +59,10 @@ index c5239db..b4fd9f7 100644
RUN \
mkdir -p ${REPOS_DIR} \
&& \
-+ pip install -U setuptools --upgrade \
++ pip3 install -U setuptools --upgrade \
+&& \
-+ pip install -U wheel \
++ pip3 install -U wheel \
+&& \
git config --global http.sslVerify false \
&& \
- pip install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \
+ pip3 install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \
diff --git a/docker/Dockerfile.centos7 b/docker/Dockerfile.centos7
index 258b939c..f9b944fe 100644
--- a/docker/Dockerfile.centos7
+++ b/docker/Dockerfile.centos7
@@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Dovetail Docker Container"
ARG BRANCH=master
RUN yum update -y && yum install -y sudo iproute epel-release && \
- yum install -y python-pip git docker && \
+ yum install -y python3-pip git docker && \
sed -ie 's/requiretty/!requiretty/g' /etc/sudoers
ENV HOME /home/opnfv
@@ -23,9 +23,9 @@ WORKDIR /home/opnfv
RUN git config --global http.sslVerify false && \
git clone --depth 1 -b $BRANCH https://git.opnfv.org/dovetail ${REPOS_DIR} && \
- pip install -U pip && \
- pip install -r ${REPOS_DIR}/requirements.txt && \
- pip install -e . && \
+ pip3 install -U pip3 && \
+ pip3 install -r ${REPOS_DIR}/requirements.txt && \
+ pip3 install -e . && \
mkdir -p ${REPOS_DIR}/results
WORKDIR ${REPOS_DIR}/dovetail