X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=ansible-server%2Fsrc%2Fmain%2FDockerfile;h=984333dad68cb959b3848fe34af5f6d8c461345f;hp=0555e7d95848f653b39fb1b699ac53ea2e5757c9;hb=refs%2Fheads%2Fmaster;hpb=72d081256d30e5591a21298d117810062eadfd3d

diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index 0555e7d9..984333da 100644
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -1,27 +1,45 @@
-FROM alpine:3.8
-
+FROM onap/integration-python:8.0.0
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
+USER root
+
+ARG http_proxy
+ARG https_proxy
+ARG no_proxy
+ARG CURL_CA_BUNDLE
+
+ENV http_proxy $http_proxy
+ENV https_proxy $https_proxy
+ENV no_proxy $no_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:-""}
+ENV CURL_CA_BUNDLE=$CURL_CA_BUNDLE
+
 ARG PIP_TAG=18.0
 
-WORKDIR /opt/
+RUN addgroup -S ansible && adduser -S ansible -G ansible
+COPY --chown=ansible:ansible ansible-server /opt/ansible-server
+COPY --chown=ansible:ansible configuration/ansible.cfg /etc/ansible/ansible.cfg
 
-COPY ansible-server/requirements.txt ansible-server/requirements.txt
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
 
-RUN apk add --no-cache py2-pip \
-                       python2 &&\
-    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 &&\
-    apk del .build-deps
+# Install certs
+RUN update-ca-certificates
 
-COPY ansible-server ansible-server
-COPY configuration/ansible.cfg /etc/ansible/ansible.cfg
+RUN echo $CURL_CA_BUNDLE && ls -l $CURL_CA_BUNDLE
 
-WORKDIR /opt/ansible-server
+RUN apk add --no-cache curl iputils bash openssh-client \
+    && curl -k 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 python3-dev \
+    && pip3 install --no-cache-dir --trusted-host pypi.org --trusted-host files.pythonhosted.org --upgrade pip ${PIP_EXTRA_OPTS} \
+    && pip3 install --no-cache-dir --trusted-host pypi.org --trusted-host files.pythonhosted.org -r /opt/ansible-server/requirements.txt ${PIP_EXTRA_OPTS} \
+    && apk del .build-deps \
+    && mkdir -p /opt/onap \
+    && touch /var/log/ansible-server.log \
+    && chown -R ansible:ansible /var/log
 
+USER ansible:ansible
 EXPOSE 8000
-
-ENTRYPOINT ["python2", "RestServer.py"]
+WORKDIR /opt/ansible-server
+##ENTRYPOINT ["python2", "RestServer.py"]