Update version from 1.2.0 to 1.2.1

[vfc/gvnfm/vnflcm.git] / lcm / docker / Dockerfile

diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile
index ce616b5..cf1e084 100755 (executable)
--- a/lcm/docker/Dockerfile
+++ b/lcm/docker/Dockerfile
@@ -6,8 +6,8 @@ ARG HTTPS_PROXY=${HTTPS_PROXY}
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
 
-RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections
-RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections
+RUN sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny
+RUN echo "set backspace=2" >> /etc/vim/vimrc.tiny
 
 RUN apt-get update && \
     apt-get install -y python-virtualenv && \
@@ -16,8 +16,6 @@ RUN apt-get update && \
     apt-get install -y python-pip && \
     apt-get install -y gcc && \
     apt-get install -y libmysqlclient-dev && \
-    apt-get install -y redis-server && \
-    apt-get install -y mysql-server && \
     apt-get install -y mysql-client && \
     apt-get install -y wget && \
     apt-get install -y unzip && \
@@ -30,25 +28,14 @@ ADD . /service
 WORKDIR /service
 
 # get binary zip from nexus
-RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnflcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnflcm.lcm&a=vfc-gvnfm-vnflcm-lcm&v=LATEST&e=zip' && \
     unzip vfc-gvnfm-vnflcm-lcm.zip && \
     rm -rf vfc-gvnfm-vnflcm-lcm.zip
 
-# get db scripts from nexus
-RUN wget -q -O vfc-gvnfm-vnfres-res.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.gvnfm.vnfres&a=vfc-gvnfm-vnfres-res&v=LATEST&e=zip' && \
-    unzip vfc-gvnfm-vnfres-res.zip vfc/gvnfm/vnfres/res/assembly/*.* && \
-    mv ./vfc/gvnfm/vnfres/res/assembly/bin ./bin && \
-    mv ./vfc/gvnfm/vnfres/res/assembly/dbscripts ./dbscripts && \
-    rm -rf vfc-gvnfm-vnfres-res.zip
-
-RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf
-
 WORKDIR /service/vfc/gvnfm/vnflcm/lcm
 RUN pip install -r requirements.txt
 
 EXPOSE 8801
-EXPOSE 3306
-EXPOSE 6379
 
 WORKDIR /service
 ENTRYPOINT vfc/gvnfm/vnflcm/lcm/docker/docker-entrypoint.sh