diff options
Diffstat (limited to 'installation/ansible-server/src')
| -rw-r--r-- | installation/ansible-server/src/main/docker/Dockerfile | 8 | ||||
| -rw-r--r-- | installation/ansible-server/src/main/scripts/startAnsibleServer.sh | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile index 1f12bf2a..373e12d2 100644 --- a/installation/ansible-server/src/main/docker/Dockerfile +++ b/installation/ansible-server/src/main/docker/Dockerfile @@ -1,6 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -#FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} -FROM onap/ccsdk-ubuntu-image:0.2.1-SNAPSHOT +FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)" @@ -16,9 +15,6 @@ RUN apt-get -y install vim ##Python: RUN apt-get -y install python2.7 RUN apt-get -y install python-pip -RUN pip install PyMySQL -RUN pip install cherrypy -RUN pip install requests ##Ansible: RUN apt-get -y install software-properties-common @@ -30,7 +26,7 @@ COPY opt /opt/ WORKDIR /opt/onap/sdnc -ENTRYPOINT exec python RestServer.py > RestServer.out +ENTRYPOINT exec startAnsibleServer.sh #CMD ["/bin/bash"] EXPOSE 8000 diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh new file mode 100644 index 00000000..67af9623 --- /dev/null +++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh @@ -0,0 +1,12 @@ +#/bin/bash + +if [ ! -d /tmp/.ansible-server-installed] +then + pip install PyMySQL + pip install cherrypy + pip install requests + date > /tmp/.ansible-server-installed 2>&1 +fi + +cd /opt/onap/sdnc +exec python RestServer.py > RestServer.out
\ No newline at end of file |