diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-07-17 14:29:10 -0400 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2021-07-17 20:54:09 +0000 |
commit | c3240af7248241bc15e5a08dacb66e8bc097b35c (patch) | |
tree | 8a5b7193bb138900909a6d21fd693acd428189f1 /ansible-server/src/main | |
parent | cf4d991f8f0dad96373616e7b6c9747e077d7643 (diff) |
Cleaning up Dockerfiles
Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: If902c2245e52e8cb911b3cb8fc5e78ded0ed3782
Diffstat (limited to 'ansible-server/src/main')
-rw-r--r-- | ansible-server/src/main/Dockerfile | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile index 27eeb8a3..1aeb186f 100644 --- a/ansible-server/src/main/Dockerfile +++ b/ansible-server/src/main/Dockerfile @@ -1,49 +1,30 @@ FROM onap/integration-python:8.0.0 - LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" -ARG PIP_TAG=18.0 - -WORKDIR /opt/ +USER root 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 \ - 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 \ - 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 +ARG PIP_TAG=18.0 RUN addgroup -S ansible && adduser -S ansible -G ansible - -COPY --chown=ansible:ansible ansible-server ansible-server +COPY --chown=ansible:ansible ansible-server /opt/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 +RUN apk add --no-cache curl iputils bash 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 python3-dev \ + && pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} \ + && pip3 install --no-cache-dir -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 - +WORKDIR /opt/ansible-server ##ENTRYPOINT ["python2", "RestServer.py"] |