summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-04-26 11:06:30 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-04-26 11:28:34 -0400
commit2f18d9c25806664e2910b39b792204b4d6f1b504 (patch)
tree0c5eddde3cbfbfa9eb6efdaef0ff58c240b65a51
parentee065f09ddf9ebab302cfd268162d56c68ef8b2d (diff)
Move pip installs from Dockerfile
Pip install seems to fail in Dockerfile. Instead, move pip installs to a startup script so that they can be done on initial container startup. Change-Id: I3125307d5f9bfc980d8f9ed0bba108a5536548fd Issue-ID: SDNC-288 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com> Former-commit-id: 3c48ffbeda720569fbfb8fac3e5db1cd0551474b
-rw-r--r--installation/ansible-server/src/main/docker/Dockerfile8
-rw-r--r--installation/ansible-server/src/main/scripts/startAnsibleServer.sh12
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