Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update to use ONAP standard base images
[ccsdk/distribution.git]
/
ansible-server
/
src
/
main
/
Dockerfile
diff --git
a/ansible-server/src/main/Dockerfile
b/ansible-server/src/main/Dockerfile
index
7ad66d3
..
9536a64
100644
(file)
--- a/
ansible-server/src/main/Dockerfile
+++ b/
ansible-server/src/main/Dockerfile
@@
-1,34
+1,43
@@
-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/
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
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 \
RUN apk add --no-cache curl \
+ iputils \
bash \
bash \
- py2-pip \
- python2 &&\
+ openssh-client &&\
apk add --no-cache --virtual .build-deps build-base \
libffi-dev \
openssl-dev \
apk add --no-cache --virtual .build-deps build-base \
libffi-dev \
openssl-dev \
- python
2
-dev &&\
- pip
install --no-cache-dir --upgrade pip==$PIP_TAG
&& \
- pip
install --no-cache-dir -r ansible-server/requirements.txt
&&\
+ python
3
-dev &&\
+ pip
3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS}
&& \
+ pip
3 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
apk del .build-deps
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
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
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 ansible:ansible /var/log/ansible-server.log
+RUN chown -R ansible:ansible /var/log
+RUN chown ansible:ansible /opt/ansible-server
USER ansible:ansible
USER ansible:ansible