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
Fix SSH transport for Ansible server
[ccsdk/distribution.git]
/
ansible-server
/
src
/
main
/
Dockerfile
diff --git
a/ansible-server/src/main/Dockerfile
b/ansible-server/src/main/Dockerfile
index
4a9c414
..
40de69e
100644
(file)
--- a/
ansible-server/src/main/Dockerfile
+++ b/
ansible-server/src/main/Dockerfile
@@
-10,6
+10,7
@@
COPY ansible-server/requirements.txt ansible-server/requirements.txt
RUN apk add --no-cache curl \
bash \
py2-pip \
RUN apk add --no-cache curl \
bash \
py2-pip \
+ openssh-client \
python2 &&\
apk add --no-cache --virtual .build-deps build-base \
libffi-dev \
python2 &&\
apk add --no-cache --virtual .build-deps build-base \
libffi-dev \
@@
-19,12
+20,20
@@
RUN apk add --no-cache curl \
pip install --no-cache-dir -r ansible-server/requirements.txt &&\
apk del .build-deps
pip 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
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 ansible:ansible /opt/ansible-server
+
+USER ansible:ansible
+
EXPOSE 8000
EXPOSE 8000