X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ansible-server%2Fsrc%2Fmain%2FDockerfile;h=27eeb8a3866f64c54d4c12f49861f42e7c9896d8;hb=b3437f7917e50673744d8cd78a2e1585b4bb08d7;hp=d44f5c39d3b811d2ff1eca486f25e0fc6a00fdc0;hpb=c6e85bc88f2dd3427360523270c7ed92c12abdc6;p=ccsdk%2Fdistribution.git

diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index d44f5c39..27eeb8a3 100644
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -1,30 +1,39 @@
-FROM alpine:3.8
+FROM onap/integration-python:8.0.0
 
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
 ARG PIP_TAG=18.0
 
 WORKDIR /opt/
 
+ENV http_proxy ${http_proxy}
+ENV https_proxy ${https_proxy}
+ENV PIP_EXTRA_OPTS ${https_proxy:+"--trusted-host pypi.org --trusted-host files.pythonhosted.org --proxy=${https_proxy}"}
+ENV PIP_EXTRA_OPTS ${PIP_EXTRA_OPTS:-""}
+
+USER root
 COPY ansible-server/requirements.txt ansible-server/requirements.txt
 
+RUN echo "https_proxy is ${https_proxy} ; PIP_EXTRA_OPTS is ${PIP_EXTRA_OPTS}"
+
 RUN apk add --no-cache curl \
+                       iputils \
                        bash \
-                       py2-pip \
-                       openssh-client \
-                       python2 &&\
+                       openssh-client &&\
+    curl https://sh.rustup.rs -sSf | sh -s -- -y &&\
+    source $HOME/.cargo/env &&\
     apk add --no-cache --virtual .build-deps build-base \
                                              libffi-dev \
                                              openssl-dev \
-                                             python2-dev &&\
-    pip install --no-cache-dir --upgrade pip==$PIP_TAG && \
-    pip install --no-cache-dir -r ansible-server/requirements.txt &&\
+                                             python3-dev &&\
+    pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} && \
+    pip3 install --no-cache-dir -r ansible-server/requirements.txt ${PIP_EXTRA_OPTS} &&\
     apk del .build-deps
 
 RUN addgroup -S ansible && adduser -S ansible -G ansible
+
 COPY --chown=ansible:ansible ansible-server ansible-server
 COPY --chown=ansible:ansible configuration/ansible.cfg /etc/ansible/ansible.cfg
 
-
 WORKDIR /opt/ansible-server
 
 RUN mkdir /opt/onap ; ln -s /opt/ansible-server /opt/onap/ccsdk