X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ansible-server%2Fsrc%2Fmain%2FDockerfile;h=9536a64632640cf202a85c3f6649378eb871b766;hb=0b9839e70cb6a3ba1328f37792d33cd1896309ef;hp=e0abb04a0a7ed0a77cb7b514b3345d5de8b2d21d;hpb=15f406b8210d615f0191108805b0489d3aaa4a38;p=ccsdk%2Fdistribution.git

diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index e0abb04a..9536a646 100644
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -1,29 +1,47 @@
-FROM alpine:3.8
+FROM onap/integration-python:7.0.1
 
 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 apk add --no-cache py2-pip \
-                       python2 &&\
+RUN echo "https_proxy is ${https_proxy} ; PIP_EXTRA_OPTS is ${PIP_EXTRA_OPTS}"
+
+RUN apk add --no-cache curl \
+                       iputils \
+                       bash \
+                       openssh-client &&\
     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
 
-COPY ansible-server ansible-server
-COPY configuration/ansible.cfg /etc/ansible/ansible.cfg
+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
+RUN echo > /var/log/ansible-server.log
+RUN chown -R ansible:ansible /var/log
+RUN chown ansible:ansible /opt/ansible-server
+
+USER ansible:ansible
+
 
 EXPOSE 8000
 
-ENTRYPOINT ["python2", "RestServer.py"]
+##ENTRYPOINT ["python2", "RestServer.py"]