migrate ansible server python scripts to python3

[ccsdk/distribution.git] / ansible-server / src / main / Dockerfile

diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index e0abb04..5a1c394 100644 (file)
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -7,23 +7,35 @@ WORKDIR /opt/
 
 COPY ansible-server/requirements.txt ansible-server/requirements.txt
 
-RUN apk add --no-cache py2-pip \
-                       python2 &&\
+RUN apk add --no-cache curl \
+                       iputils \
+                       bash \
+                       py3-pip \
+                       openssh-client \
+                       python3 &&\
     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_TAG && \
+    pip3 install --no-cache-dir -r ansible-server/requirements.txt &&\
     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"]