diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-09-01 16:21:53 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-09-01 16:24:53 -0400 |
| commit | 0b9839e70cb6a3ba1328f37792d33cd1896309ef (patch) | |
| tree | 0015f5c1e97ae2f0a2f05e072aa375eb1f7b4806 /ansible-server | |
| parent | 884302ca87b0544c885d4eb7a95eab3a9593483d (diff) | |
Update to use ONAP standard base images
Updated all containers to use one of the 2 approved ONAP base images:
- onap/integration-java11
- onap/integration-python
Change-Id: I961e9af38d790f74528a726a0fc68d1a2e5fbfb9
Issue-ID: CCSDK-2418
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'ansible-server')
| -rw-r--r-- | ansible-server/src/main/Dockerfile | 17 | ||||
| -rwxr-xr-x | ansible-server/src/main/ansible-server/startAnsibleServer.sh | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile index 2751a482..9536a646 100644 --- a/ansible-server/src/main/Dockerfile +++ b/ansible-server/src/main/Dockerfile @@ -1,23 +1,30 @@ -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 echo "https_proxy is ${https_proxy} ; PIP_EXTRA_OPTS is ${PIP_EXTRA_OPTS}" + RUN apk add --no-cache curl \ iputils \ bash \ - openssh-client \ - python3 &&\ + openssh-client &&\ apk add --no-cache --virtual .build-deps build-base \ libffi-dev \ openssl-dev \ python3-dev &&\ - pip3 install --no-cache-dir --upgrade pip==$PIP_TAG && \ - pip3 install --no-cache-dir -r ansible-server/requirements.txt &&\ + 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 diff --git a/ansible-server/src/main/ansible-server/startAnsibleServer.sh b/ansible-server/src/main/ansible-server/startAnsibleServer.sh index 2853acad..172ae530 100755 --- a/ansible-server/src/main/ansible-server/startAnsibleServer.sh +++ b/ansible-server/src/main/ansible-server/startAnsibleServer.sh @@ -2,5 +2,5 @@ exec &> >(tee -a "/var/log/ansible-server.log") cd /opt/onap/ccsdk -exec /usr/bin/python3 RestServer.py +exec /usr/local/bin/python3 RestServer.py |